diff options
author | Ian Kent <raven@themaw.net> | 2016-03-15 17:58:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-15 19:55:16 -0400 |
commit | 0266725ad4ee0f8fcf2ee73be8e68c4adbf2ac79 (patch) | |
tree | 3ad8ce6301b4ccbc3bb744510ed6140ef01aa3ef | |
parent | e3cd8067c1cd686fed2fe75f6cf98c62fc6ff57e (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>
-rw-r--r-- | fs/autofs4/dev-ioctl.c | 1 | ||||
-rw-r--r-- | fs/autofs4/inode.c | 2 | ||||
-rw-r--r-- | fs/autofs4/root.c | 8 | ||||
-rw-r--r-- | fs/autofs4/waitq.c | 3 | ||||
-rw-r--r-- | include/uapi/linux/auto_fs.h | 2 | ||||
-rw-r--r-- | include/uapi/linux/auto_fs4.h | 2 |
6 files changed, 8 insertions, 10 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 | ||
92 | static void autofs4_notify_daemon(struct autofs_sb_info *sbi, | 92 | static 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 | |||
diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h index 5fe176aa61d1..9175a1b4dc69 100644 --- a/include/uapi/linux/auto_fs.h +++ b/include/uapi/linux/auto_fs.h | |||
@@ -48,7 +48,7 @@ struct autofs_packet_hdr { | |||
48 | 48 | ||
49 | struct autofs_packet_missing { | 49 | struct autofs_packet_missing { |
50 | struct autofs_packet_hdr hdr; | 50 | struct autofs_packet_hdr hdr; |
51 | autofs_wqt_t wait_queue_token; | 51 | autofs_wqt_t wait_queue_token; |
52 | int len; | 52 | int len; |
53 | char name[NAME_MAX+1]; | 53 | char name[NAME_MAX+1]; |
54 | }; | 54 | }; |
diff --git a/include/uapi/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h index 924fb1adab0b..8f8f1bdcca8c 100644 --- a/include/uapi/linux/auto_fs4.h +++ b/include/uapi/linux/auto_fs4.h | |||
@@ -108,7 +108,7 @@ enum autofs_notify { | |||
108 | /* v4 multi expire (via pipe) */ | 108 | /* v4 multi expire (via pipe) */ |
109 | struct autofs_packet_expire_multi { | 109 | struct autofs_packet_expire_multi { |
110 | struct autofs_packet_hdr hdr; | 110 | struct autofs_packet_hdr hdr; |
111 | autofs_wqt_t wait_queue_token; | 111 | autofs_wqt_t wait_queue_token; |
112 | int len; | 112 | int len; |
113 | char name[NAME_MAX+1]; | 113 | char name[NAME_MAX+1]; |
114 | }; | 114 | }; |