diff options
Diffstat (limited to 'fs/autofs4/root.c')
-rw-r--r-- | fs/autofs4/root.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index aa8228eb104b..18c39824a009 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
@@ -618,7 +618,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry) | |||
618 | struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb); | 618 | struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb); |
619 | struct autofs_info *ino = autofs4_dentry_ino(dentry); | 619 | struct autofs_info *ino = autofs4_dentry_ino(dentry); |
620 | struct autofs_info *p_ino; | 620 | struct autofs_info *p_ino; |
621 | 621 | ||
622 | /* This allows root to remove symlinks */ | 622 | /* This allows root to remove symlinks */ |
623 | if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN)) | 623 | if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN)) |
624 | return -EPERM; | 624 | return -EPERM; |
@@ -698,7 +698,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry) | |||
698 | struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb); | 698 | struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb); |
699 | struct autofs_info *ino = autofs4_dentry_ino(dentry); | 699 | struct autofs_info *ino = autofs4_dentry_ino(dentry); |
700 | struct autofs_info *p_ino; | 700 | struct autofs_info *p_ino; |
701 | 701 | ||
702 | DPRINTK("dentry %p, removing %pd", dentry, dentry); | 702 | DPRINTK("dentry %p, removing %pd", dentry, dentry); |
703 | 703 | ||
704 | if (!autofs4_oz_mode(sbi)) | 704 | if (!autofs4_oz_mode(sbi)) |
@@ -878,10 +878,10 @@ static int autofs4_root_ioctl_unlocked(struct inode *inode, struct file *filp, | |||
878 | if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) || | 878 | if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) || |
879 | _IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT) | 879 | _IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT) |
880 | return -ENOTTY; | 880 | return -ENOTTY; |
881 | 881 | ||
882 | if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN)) | 882 | if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN)) |
883 | return -EPERM; | 883 | return -EPERM; |
884 | 884 | ||
885 | switch (cmd) { | 885 | switch (cmd) { |
886 | case AUTOFS_IOC_READY: /* Wait queue: go ahead and retry */ | 886 | case AUTOFS_IOC_READY: /* Wait queue: go ahead and retry */ |
887 | return autofs4_wait_release(sbi, (autofs_wqt_t) arg, 0); | 887 | return autofs4_wait_release(sbi, (autofs_wqt_t) arg, 0); |