aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2016-03-15 17:58:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-15 19:55:16 -0400
commit0266725ad4ee0f8fcf2ee73be8e68c4adbf2ac79 (patch)
tree3ad8ce6301b4ccbc3bb744510ed6140ef01aa3ef /fs
parente3cd8067c1cd686fed2fe75f6cf98c62fc6ff57e (diff)
autofs4: fix some white space errors
Fix some white space format errors. Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/autofs4/dev-ioctl.c1
-rw-r--r--fs/autofs4/inode.c2
-rw-r--r--fs/autofs4/root.c8
-rw-r--r--fs/autofs4/waitq.c3
4 files changed, 6 insertions, 8 deletions
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index c64b9fa839c5..b8d0329ba775 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -765,4 +765,3 @@ void autofs_dev_ioctl_exit(void)
765{ 765{
766 misc_deregister(&_autofs_dev_ioctl_misc); 766 misc_deregister(&_autofs_dev_ioctl_misc);
767} 767}
768
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index ad03705aac43..7872830d3de9 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -327,7 +327,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
327 */ 327 */
328 s->s_root = root; 328 s->s_root = root;
329 return 0; 329 return 0;
330 330
331 /* 331 /*
332 * Failure ... clean up. 332 * Failure ... clean up.
333 */ 333 */
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);
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 4aeae3b9f278..a8a94621d813 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -88,7 +88,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
88 88
89 return (bytes > 0); 89 return (bytes > 0);
90} 90}
91 91
92static void autofs4_notify_daemon(struct autofs_sb_info *sbi, 92static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
93 struct autofs_wait_queue *wq, 93 struct autofs_wait_queue *wq,
94 int type) 94 int type)
@@ -569,4 +569,3 @@ int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok
569 569
570 return 0; 570 return 0;
571} 571}
572