Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/lfs_cleanerd Don't exit when running as a lib after ...



details:   https://anonhg.NetBSD.org/src/rev/8238a823d980
branches:  trunk
changeset: 757159:8238a823d980
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 16 22:11:55 2010 +0000

description:
Don't exit when running as a lib after FS is unmounted, just return
from the mainloop.

diffstat:

 libexec/lfs_cleanerd/lfs_cleanerd.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 7e73975fa15d -r 8238a823d980 libexec/lfs_cleanerd/lfs_cleanerd.c
--- a/libexec/lfs_cleanerd/lfs_cleanerd.c       Mon Aug 16 20:20:44 2010 +0000
+++ b/libexec/lfs_cleanerd/lfs_cleanerd.c       Mon Aug 16 22:11:55 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.25 2010/07/29 14:09:45 pooka Exp $       */
+/* $NetBSD: lfs_cleanerd.c,v 1.26 2010/08/16 22:11:55 pooka Exp $       */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -1543,6 +1543,7 @@
        if (semaddr)
                sem_post(semaddr);
 #endif
+       error = 0;
        while (nfss > 0) {
                int cleaned_one;
                do {
@@ -1581,11 +1582,17 @@
                                        handle_error(fsp, i);
                                        assert(nfss == 0);
                                }
-                       } else
+                       } else {
+#ifdef LFS_CLEANER_AS_LIB
+                               error = ESHUTDOWN;
+                               break;
+#else
                                err(1, "LFCNSEGWAITALL");
+#endif
+                       }
                }
        }
 
        /* NOTREACHED */
-       return 0;
+       return error;
 }



Home | Main Index | Thread Index | Old Index