From: Ian Kent Change the functions may_umount and may_umount_tree to boolean functions to aid code readability. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton --- fs/autofs/dirhash.c | 2 +- fs/autofs4/expire.c | 2 +- fs/autofs4/root.c | 2 +- fs/namespace.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff -puN fs/autofs4/expire.c~autofs4-change-may_umount-functions-to-boolean fs/autofs4/expire.c --- devel/fs/autofs4/expire.c~autofs4-change-may_umount-functions-to-boolean 2006-01-18 18:23:13.000000000 -0800 +++ devel-akpm/fs/autofs4/expire.c 2006-01-18 18:23:14.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; diff -puN fs/autofs4/root.c~autofs4-change-may_umount-functions-to-boolean fs/autofs4/root.c --- devel/fs/autofs4/root.c~autofs4-change-may_umount-functions-to-boolean 2006-01-18 18:23:13.000000000 -0800 +++ devel-akpm/fs/autofs4/root.c 2006-01-18 18:23:14.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); diff -puN fs/autofs/dirhash.c~autofs4-change-may_umount-functions-to-boolean fs/autofs/dirhash.c --- devel/fs/autofs/dirhash.c~autofs4-change-may_umount-functions-to-boolean 2006-01-18 18:23:14.000000000 -0800 +++ devel-akpm/fs/autofs/dirhash.c 2006-01-18 18:23:14.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! */ diff -puN fs/namespace.c~autofs4-change-may_umount-functions-to-boolean fs/namespace.c --- devel/fs/namespace.c~autofs4-change-may_umount-functions-to-boolean 2006-01-18 18:23:14.000000000 -0800 +++ devel-akpm/fs/namespace.c 2006-01-18 18:23:14.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; } _