Skip to content

Commit

Permalink
[PATCH] autofs4: change may_umount* functions to boolean
Browse files Browse the repository at this point in the history
Change the functions may_umount and may_umount_tree to boolean functions to
aid code readability.

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Ian Kent authored and Linus Torvalds committed Mar 27, 2006
1 parent 90a59c7 commit e3474a8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion fs/autofs/dirhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
;
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! */
Expand Down
2 changes: 1 addition & 1 deletion fs/autofs4/expire.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
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;
Expand Down
2 changes: 1 addition & 1 deletion fs/autofs4/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ static inline int autofs4_ask_umount(struct vfsmount *mnt, int __user *p)
{
int status = 0;

if (may_umount(mnt) == 0)
if (may_umount(mnt))
status = 1;

DPRINTK("returning %d", status);
Expand Down
8 changes: 4 additions & 4 deletions fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,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);
Expand All @@ -481,10 +481,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;
}
Expand Down

0 comments on commit e3474a8

Please sign in to comment.