autofs4: make autofs type usage explicit
- the type assigned at mount when no type is given is changed from 0 to AUTOFS_TYPE_INDIRECT. This was done because 0 and AUTOFS_TYPE_INDIRECT were being treated implicitly as the same type. - previously, an offset mount had it's type set to AUTOFS_TYPE_DIRECT|AUTOFS_TYPE_OFFSET but the mount control re-implementation needs to be able distinguish all three types. So this was changed to make the type setting explicit. - a type AUTOFS_TYPE_ANY was added for use by the re-implementation when checking if a given path is a mountpoint. It's not really a type as we use this to ask if a given path is a mountpoint in the autofs_dev_ioctl_ismountpoint() function. - functions to set and test the autofs mount types have been added to improve readability and make the type usage explicit. - the mount type is used from user space for the mount control re-implementtion so, for consistency, all the definitions have been moved to the user space include file include/linux/auto_fs4.h. Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
@@ -63,7 +63,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
|
||||
struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
|
||||
|
||||
/* This is an autofs submount, we can't expire it */
|
||||
if (sbi->type == AUTOFS_TYPE_INDIRECT)
|
||||
if (autofs_type_indirect(sbi->type))
|
||||
goto done;
|
||||
|
||||
/*
|
||||
@@ -490,7 +490,7 @@ int autofs4_expire_multi(struct super_block *sb, struct vfsmount *mnt,
|
||||
if (arg && get_user(do_now, arg))
|
||||
return -EFAULT;
|
||||
|
||||
if (sbi->type & AUTOFS_TYPE_TRIGGER)
|
||||
if (autofs_type_trigger(sbi->type))
|
||||
dentry = autofs4_expire_direct(sb, mnt, sbi, do_now);
|
||||
else
|
||||
dentry = autofs4_expire_indirect(sb, mnt, sbi, do_now);
|
||||
|
Reference in New Issue
Block a user