From: Ian Kent <raven@themaw.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
autofs mailing list <autofs@vger.kernel.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 02/13] autofs4 - fix some white space errors
Date: Mon, 03 Nov 2014 16:12:24 +0800 [thread overview]
Message-ID: <20141103081224.6215.69417.stgit@perseus.themaw.net> (raw)
In-Reply-To: <20141103081218.6215.85903.stgit@perseus.themaw.net>
Fix some white space format errors.
Signed-off-by: Ian Kent <raven@themaw.net>
---
fs/autofs4/inode.c | 2 +-
fs/autofs4/root.c | 8 ++++----
fs/autofs4/waitq.c | 2 +-
include/uapi/linux/auto_fs.h | 2 +-
include/uapi/linux/auto_fs4.h | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index e855334..80389af 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -323,7 +323,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
*/
s->s_root = root;
return 0;
-
+
/*
* Failure ... clean up.
*/
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 373be98..7f3e182 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -624,7 +624,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;
@@ -704,7 +704,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 %.*s",
dentry, dentry->d_name.len, dentry->d_name.name);
@@ -874,10 +874,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);
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index a0b6a97..b7f2deb 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -86,7 +86,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)
diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h
index 5fe176a..9175a1b 100644
--- a/include/uapi/linux/auto_fs.h
+++ b/include/uapi/linux/auto_fs.h
@@ -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];
};
diff --git a/include/uapi/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h
index 924fb1a..8f8f1bd 100644
--- a/include/uapi/linux/auto_fs4.h
+++ b/include/uapi/linux/auto_fs4.h
@@ -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];
};
next prev parent reply other threads:[~2014-11-03 8:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 8:12 [PATCH 01/13] autofs4 - coding style fixes Ian Kent
2014-11-03 8:12 ` Ian Kent [this message]
2014-11-03 8:12 ` [PATCH 03/13] autofs4 - use pr print in AUTOFS prints Ian Kent
2014-11-03 8:12 ` [PATCH 04/13] autofs4 - change printks AUTOFS defined prints Ian Kent
2014-11-03 8:25 ` Joe Perches
2014-11-03 9:20 ` Ian Kent
2014-11-03 14:33 ` Joe Perches
2014-11-05 23:02 ` Ian Kent
2014-11-05 23:20 ` Joe Perches
2014-11-05 23:42 ` Ian Kent
2014-11-03 8:12 ` [PATCH 05/13] autofs4 - fix string.h include in auto_dev-ioctl.h Ian Kent
2014-11-03 8:12 ` [PATCH 06/13] autofs4 - move linux/auto_dev-ioctl.h to uapi/linux Ian Kent
2014-11-03 8:12 ` [PATCH 07/13] autofs - merge auto_fs.h and auto_fs4.h Ian Kent
2014-11-03 8:12 ` [PATCH 08/13] autofs - use autofs instead of autofs4 everywhere Ian Kent
2014-11-03 8:13 ` [PATCH 09/13] autofs - copy autofs4 to autofs Ian Kent
2014-11-03 8:13 ` [PATCH 10/13] autofs - create autofs Kconfig and Makefile Ian Kent
2014-11-03 8:13 ` [PATCH 11/13] autofs - update fs/autofs4/Kconfig Ian Kent
2014-11-03 8:13 ` [PATCH 12/13] autofs - update fs/autofs4/Makefile Ian Kent
2014-11-03 8:13 ` [PATCH 13/13] autofs - delete fs/autofs4 source files Ian Kent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141103081224.6215.69417.stgit@perseus.themaw.net \
--to=raven@themaw.net \
--cc=akpm@linux-foundation.org \
--cc=autofs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).