Don't clean if its not possible for us to generate any new segments.

SCCS-vsn: libexec/lfs_cleanerd/cleanerd.c 5.5

diff --git a/usr/src/libexec/lfs_cleanerd/cleanerd.c b/usr/src/libexec/lfs_cleanerd/cleanerd.c
index c914328..388a799 100644 (file)
--- a/usr/src/libexec/lfs_cleanerd/cleanerd.c
+++ b/usr/src/libexec/lfs_cleanerd/cleanerd.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)cleanerd.c 5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)cleanerd.c 5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -167,8 +167,9 @@ clean_loop(fsp)
         * space is less than BUSY_LIM % of possible clean space.
         */
        now = time((time_t *)NULL);
         * space is less than BUSY_LIM % of possible clean space.
         */
        now = time((time_t *)NULL);

-       if (fsp->fi_cip->clean <= MIN_SEGS(&fsp->fi_lfs) ||
-           fsp->fi_cip->clean < max_free_segs * BUSY_LIM) {
+       if (fsp->fi_cip->clean < max_free_segs &&
+           (fsp->fi_cip->clean <= MIN_SEGS(&fsp->fi_lfs) ||
+           fsp->fi_cip->clean < max_free_segs * BUSY_LIM)) {

                printf("Cleaner Running  at %s (need space)\n",
                    ctime(&now));
                clean_fs(fsp, cost_benefit);
                printf("Cleaner Running  at %s (need space)\n",
                    ctime(&now));
                clean_fs(fsp, cost_benefit);