Messages in this thread Patch in this message | | | Date | Wed, 18 Jan 2006 15:24:30 +0800 | From | Ian Kent <> | Subject | [PATCH 12/13] autofs4 - change may_umount* functions to boolean |
| |
This patch changes the functions may_umount and may_umount_tree to boolean functions to aid code readability.
Signed-off-by: Ian Kent <raven@themaw.net>
--- linux-2.6.15-mm4/fs/namespace.c.may_umount-to-boolean 2006-01-15 16:06:59.000000000 +0800 +++ linux-2.6.15-mm4/fs/namespace.c 2006-01-15 16:08:36.000000000 +0800 @@ -421,9 +421,9 @@ int may_umount_tree(struct vfsmount *mnt spin_unlock(&vfsmount_lock); if (actual_refs > minimum_refs) - return -EBUSY; + return 0; - return 0; + return 1; } EXPORT_SYMBOL(may_umount_tree); @@ -443,10 +443,10 @@ EXPORT_SYMBOL(may_umount_tree); */ int may_umount(struct vfsmount *mnt) { - int ret = 0; + int ret = 1; spin_lock(&vfsmount_lock); if (propagate_mount_busy(mnt, 2)) - ret = -EBUSY; + ret = 0; spin_unlock(&vfsmount_lock); return ret; } --- linux-2.6.15-mm4/fs/autofs4/root.c.may_umount-to-boolean 2006-01-15 16:10:22.000000000 +0800 +++ linux-2.6.15-mm4/fs/autofs4/root.c 2006-01-15 16:11:35.000000000 +0800 @@ -699,7 +699,7 @@ static inline int autofs4_ask_umount(str { int status = 0; - if (may_umount(mnt) == 0) + if (may_umount(mnt)) status = 1; DPRINTK("returning %d", status); --- linux-2.6.15-mm4/fs/autofs4/expire.c.may_umount-to-boolean 2006-01-15 16:10:34.000000000 +0800 +++ linux-2.6.15-mm4/fs/autofs4/expire.c 2006-01-15 16:10:54.000000000 +0800 @@ -64,7 +64,7 @@ static int autofs4_mount_busy(struct vfs goto done; /* Update the expiry counter if fs is busy */ - if (may_umount_tree(mnt)) { + if (!may_umount_tree(mnt)) { struct autofs_info *ino = autofs4_dentry_ino(top); ino->last_used = jiffies; goto done; --- linux-2.6.15-mm4/fs/autofs/dirhash.c.may_umount-to-boolean 2006-01-15 16:09:08.000000000 +0800 +++ linux-2.6.15-mm4/fs/autofs/dirhash.c 2006-01-15 16:09:46.000000000 +0800 @@ -92,7 +92,7 @@ struct autofs_dir_ent *autofs_expire(str ; dput(dentry); - if ( may_umount(mnt) == 0 ) { + if ( may_umount(mnt) ) { mntput(mnt); DPRINTK(("autofs: signaling expire on %s\n", ent->name)); return ent; /* Expirable! */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |