Skip to content

Commit

Permalink
autofs4: fix some white space errors
Browse files Browse the repository at this point in the history
Fix some white space format errors.

Signed-off-by: Ian Kent <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
raven-au authored and torvalds committed Mar 15, 2016
1 parent e3cd806 commit 0266725
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
1 change: 0 additions & 1 deletion fs/autofs4/dev-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -765,4 +765,3 @@ void autofs_dev_ioctl_exit(void)
{
misc_deregister(&_autofs_dev_ioctl_misc);
}

2 changes: 1 addition & 1 deletion fs/autofs4/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
*/
s->s_root = root;
return 0;

/*
* Failure ... clean up.
*/
Expand Down
8 changes: 4 additions & 4 deletions fs/autofs4/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_info *ino = autofs4_dentry_ino(dentry);
struct autofs_info *p_ino;

/* This allows root to remove symlinks */
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
return -EPERM;
Expand Down Expand Up @@ -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_info *ino = autofs4_dentry_ino(dentry);
struct autofs_info *p_ino;

DPRINTK("dentry %p, removing %pd", dentry, dentry);

if (!autofs4_oz_mode(sbi))
Expand Down Expand Up @@ -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) ||
_IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT)
return -ENOTTY;

if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
return -EPERM;

switch (cmd) {
case AUTOFS_IOC_READY: /* Wait queue: go ahead and retry */
return autofs4_wait_release(sbi, (autofs_wqt_t) arg, 0);
Expand Down
3 changes: 1 addition & 2 deletions fs/autofs4/waitq.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,

return (bytes > 0);
}

static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
struct autofs_wait_queue *wq,
int type)
Expand Down Expand Up @@ -569,4 +569,3 @@ int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok

return 0;
}

2 changes: 1 addition & 1 deletion include/uapi/linux/auto_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct autofs_packet_hdr {

struct autofs_packet_missing {
struct autofs_packet_hdr hdr;
autofs_wqt_t wait_queue_token;
autofs_wqt_t wait_queue_token;
int len;
char name[NAME_MAX+1];
};
Expand Down
2 changes: 1 addition & 1 deletion include/uapi/linux/auto_fs4.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ enum autofs_notify {
/* v4 multi expire (via pipe) */
struct autofs_packet_expire_multi {
struct autofs_packet_hdr hdr;
autofs_wqt_t wait_queue_token;
autofs_wqt_t wait_queue_token;
int len;
char name[NAME_MAX+1];
};
Expand Down

0 comments on commit 0266725

Please sign in to comment.