xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autofs4: fix some white space errors

Browse Source 
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>
This commit is contained in:
Ian Kent
2016-03-15 14:58:36 -07:00
committed by Linus Torvalds
parent e3cd8067c1
commit 0266725ad4
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/autofs4/dev-ioctl.c
View File

@@ -765,4 +765,3 @@ void autofs_dev_ioctl_exit(void)
{ {
misc_deregister(&_autofs_dev_ioctl_misc); misc_deregister(&_autofs_dev_ioctl_misc);
} }

2
fs/autofs4/inode.c
View File

@@ -327,7 +327,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
*/ */
s->s_root = root; s->s_root = root;
return 0; return 0;
/* /*
* Failure ... clean up. * Failure ... clean up.
*/ */

8
fs/autofs4/root.c
View File

@@ -618,7 +618,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb); struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
struct autofs_info *ino = autofs4_dentry_ino(dentry); struct autofs_info *ino = autofs4_dentry_ino(dentry);
struct autofs_info *p_ino; struct autofs_info *p_ino;
/* This allows root to remove symlinks */ /* This allows root to remove symlinks */
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN)) if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
@@ -698,7 +698,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry)
struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb); struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
struct autofs_info *ino = autofs4_dentry_ino(dentry); struct autofs_info *ino = autofs4_dentry_ino(dentry);
struct autofs_info *p_ino; struct autofs_info *p_ino;
DPRINTK("dentry %p, removing %pd", dentry, dentry); DPRINTK("dentry %p, removing %pd", dentry, dentry);
if (!autofs4_oz_mode(sbi)) if (!autofs4_oz_mode(sbi))
@@ -878,10 +878,10 @@ static int autofs4_root_ioctl_unlocked(struct inode *inode, struct file *filp,
if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) || if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
_IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT) _IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT)
return -ENOTTY; return -ENOTTY;
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN)) if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
switch (cmd) { switch (cmd) {
case AUTOFS_IOC_READY: /* Wait queue: go ahead and retry */ case AUTOFS_IOC_READY: /* Wait queue: go ahead and retry */
return autofs4_wait_release(sbi, (autofs_wqt_t) arg, 0); return autofs4_wait_release(sbi, (autofs_wqt_t) arg, 0);

3
fs/autofs4/waitq.c
View File

@@ -88,7 +88,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
return (bytes > 0); return (bytes > 0);
} }
static void autofs4_notify_daemon(struct autofs_sb_info *sbi, static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
struct autofs_wait_queue *wq, struct autofs_wait_queue *wq,
int type) int type)
@@ -569,4 +569,3 @@ int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok
return 0; return 0;
} }

2
include/uapi/linux/auto_fs.h
View File

@@ -48,7 +48,7 @@ struct autofs_packet_hdr {
struct autofs_packet_missing { struct autofs_packet_missing {
struct autofs_packet_hdr hdr; struct autofs_packet_hdr hdr;
autofs_wqt_t wait_queue_token; autofs_wqt_t wait_queue_token;
int len; int len;
char name[NAME_MAX+1]; char name[NAME_MAX+1];
}; };

2
include/uapi/linux/auto_fs4.h
View File

@@ -108,7 +108,7 @@ enum autofs_notify {
/* v4 multi expire (via pipe) */ /* v4 multi expire (via pipe) */
struct autofs_packet_expire_multi { struct autofs_packet_expire_multi {
struct autofs_packet_hdr hdr; struct autofs_packet_hdr hdr;
autofs_wqt_t wait_queue_token; autofs_wqt_t wait_queue_token;
int len; int len;
char name[NAME_MAX+1]; char name[NAME_MAX+1];
}; };