[src/trunk]: src/libexec/lfs_cleanerd move the compiler hack closer to the so...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cff7e473c07f
branches:  trunk
changeset: 344255:cff7e473c07f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Mar 18 10:10:21 2016 +0000

description:
move the compiler hack closer to the source of the fail

diffstat:

 libexec/lfs_cleanerd/lfs_cleanerd.c |  34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diffs (56 lines):

diff -r 371b4d4b1f89 -r cff7e473c07f libexec/lfs_cleanerd/lfs_cleanerd.c
--- a/libexec/lfs_cleanerd/lfs_cleanerd.c       Fri Mar 18 10:09:46 2016 +0000
+++ b/libexec/lfs_cleanerd/lfs_cleanerd.c       Fri Mar 18 10:10:21 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.57 2016/03/16 18:58:34 mrg Exp $         */
+/* $NetBSD: lfs_cleanerd.c,v 1.58 2016/03/18 10:10:21 mrg Exp $         */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -1284,8 +1284,23 @@
        double loadavg;
 
        /* If this fs is "on hold", don't clean it. */
-       if (fs->clfs_onhold)
+       if (fs->clfs_onhold) {
+#if defined(__GNUC__) && \
+    (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && \
+    defined(__OPTIMIZE_SIZE__)
+       /*
+        * XXX: Work around apparent bug with GCC >= 4.8 and -Os: it
+        * claims that ci.clean is uninitialized in clean_fs (at one
+        * of the several uses of it, which is neither the first nor
+        * last use) -- this doesn't happen with plain -O2.
+        *
+        * Hopefully in the future further rearrangements will allow
+        * removing this hack.
+        */
+               cip->clean = 0;
+#endif
                return 0;
+       }
 
        /*
         * Read the cleanerinfo block from the Ifile.  We don't want
@@ -1453,21 +1468,6 @@
        char *cp, *pidname;
 #endif
 
-#if defined(__GNUC__) && \
-    (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && \
-    defined(__OPTIMIZE_SIZE__)
-       /*
-        * XXX: Work around apparent bug with GCC >= 4.8 and -Os: it
-        * claims that ci.clean is uninitialized in clean_fs (at one
-        * of the several uses of it, which is neither the first nor
-        * last use) -- this doesn't happen with plain -O2.
-        *
-        * Hopefully in the future further rearrangements will allow
-        * removing this hack.
-        */
-       ci.clean = 0;
-#endif
-
        /*
         * Set up defaults
         */