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:
@ -532,7 +532,7 @@ static int autofs_dev_ioctl_expire(struct file *fp,
|
||||
how = param->expire.how;
|
||||
mnt = fp->f_path.mnt;
|
||||
|
||||
if (sbi->type & AUTOFS_TYPE_TRIGGER)
|
||||
if (autofs_type_trigger(sbi->type))
|
||||
dentry = autofs4_expire_direct(sbi->sb, mnt, sbi, how);
|
||||
else
|
||||
dentry = autofs4_expire_indirect(sbi->sb, mnt, sbi, how);
|
||||
@ -615,7 +615,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
|
||||
param->ismountpoint.out.magic = magic = 0;
|
||||
|
||||
if (!fp || param->ioctlfd == -1) {
|
||||
if (type == AUTOFS_TYPE_ANY) {
|
||||
if (autofs_type_any(type)) {
|
||||
struct super_block *sb;
|
||||
|
||||
err = path_lookup(path, LOOKUP_FOLLOW, &nd);
|
||||
|
||||
Reference in New Issue
Block a user