[systemd-commits] src/fstab-generator

Tom Gundersen tomegun at kemper.freedesktop.org
Mon Nov 26 15:58:27 PST 2012


 src/fstab-generator/fstab-generator.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 1d634e21b453f3c80d7c6c4bd90a6b84e42a3d2a
Author: Tom Gundersen <teg at jklm.no>
Date:   Tue Nov 27 00:52:01 2012 +0100

    fstab-generator: drop mount_is_bind
    
    Do the check in-line instead, as the function is now a bit pointless.

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index bb4dd97..7b3bf11 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -191,12 +191,6 @@ finish:
         return r;
 }
 
-static bool mount_is_bind(struct mntent *me) {
-        assert(me);
-
-        return hasmntopt(me, "bind");
-}
-
 static bool mount_is_network(struct mntent *me) {
         assert(me);
 
@@ -229,7 +223,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
                 return 0;
 
         isnetwork = mount_is_network(me);
-        isbind = mount_is_bind(me);
+        isbind = !!hasmntopt(me, "bind");
 
         noauto = !!hasmntopt(me, "noauto");
         nofail = !!hasmntopt(me, "nofail");



More information about the systemd-commits mailing list