From: John Kacur <jkacur@redhat.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Kacur <jkacur@redhat.com>, Arnd Bergmann <arnd@arndb.de>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jan Harkes <jaharkes@cs.cmu.edu>,
coda@cs.cmu.edu
Subject: [PATCH 2/6] coda: Clean-up whitespace problems in pioctl.c
Date: Wed, 5 May 2010 15:15:35 +0200 [thread overview]
Message-ID: <1273065339-21669-3-git-send-email-jkacur@redhat.com> (raw)
In-Reply-To: <1273065339-21669-1-git-send-email-jkacur@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
fs/coda/pioctl.c | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c
index 96ace2c..ca25d96 100644
--- a/fs/coda/pioctl.c
+++ b/fs/coda/pioctl.c
@@ -1,6 +1,6 @@
/*
* Pioctl operations for Coda.
- * Original version: (C) 1996 Peter Braam
+ * Original version: (C) 1996 Peter Braam
* Rewritten for Linux 2.1: (C) 1997 Carnegie Mellon University
*
* Carnegie Mellon encourages users of this code to contribute improvements
@@ -31,8 +31,7 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
unsigned long user_data);
/* exported from this file */
-const struct inode_operations coda_ioctl_inode_operations =
-{
+const struct inode_operations coda_ioctl_inode_operations = {
.permission = coda_ioctl_permission,
.setattr = coda_setattr,
};
@@ -52,28 +51,28 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
unsigned long user_data)
{
struct path path;
- int error;
+ int error;
struct PioctlData data;
struct inode *inode = filp->f_dentry->d_inode;
- struct inode *target_inode = NULL;
- struct coda_inode_info *cnp;
+ struct inode *target_inode = NULL;
+ struct coda_inode_info *cnp;
lock_kernel();
- /* get the Pioctl data arguments from user space */
- if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
+ /* get the Pioctl data arguments from user space */
+ if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
error = -EINVAL;
goto out;
}
-
- /*
- * Look up the pathname. Note that the pathname is in
- * user memory, and namei takes care of this
- */
+
+ /*
+ * Look up the pathname. Note that the pathname is in
+ * user memory, and namei takes care of this
+ */
if (data.follow)
- error = user_path(data.path, &path);
+ error = user_path(data.path, &path);
else
- error = user_lpath(data.path, &path);
+ error = user_lpath(data.path, &path);
if (error)
goto out;
@@ -81,14 +80,14 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
target_inode = path.dentry->d_inode;
/* return if it is not a Coda inode */
- if ( target_inode->i_sb != inode->i_sb ) {
+ if (target_inode->i_sb != inode->i_sb) {
path_put(&path);
error = -EINVAL;
goto out;
}
/* now proceed to make the upcall */
- cnp = ITOC(target_inode);
+ cnp = ITOC(target_inode);
error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data);
@@ -96,5 +95,5 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
out:
unlock_kernel();
- return error;
+ return error;
}
--
1.6.6.1
next prev parent reply other threads:[~2010-05-05 13:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-05 13:15 [PATCH 0/6] BKL ioctl pushdown John Kacur
2010-05-05 13:15 ` [PATCH 1/6] coda: " John Kacur
2010-05-17 2:10 ` Frederic Weisbecker
2010-05-05 13:15 ` John Kacur [this message]
2010-05-17 2:13 ` [PATCH 2/6] coda: Clean-up whitespace problems in pioctl.c Frederic Weisbecker
2010-05-05 13:15 ` [PATCH 3/6] fat: BKL ioctl pushdown John Kacur
2010-05-05 16:04 ` OGAWA Hirofumi
2010-05-05 17:34 ` John Kacur
2010-05-05 18:30 ` OGAWA Hirofumi
2010-05-05 19:55 ` [PATCH] fat: convert to unlocked_ioctl Arnd Bergmann
2010-05-05 21:06 ` OGAWA Hirofumi
2010-05-05 20:16 ` [PATCH 3/6] fat: BKL ioctl pushdown John Kacur
2010-05-05 13:15 ` [PATCH 4/6] ncpfs: " John Kacur
2010-05-17 2:24 ` Frederic Weisbecker
2010-05-05 13:15 ` [PATCH 5/6] smbfs: " John Kacur
2010-05-17 2:26 ` Frederic Weisbecker
2010-05-17 2:35 ` Frederic Weisbecker
2010-05-17 11:46 ` John Kacur
2010-05-05 13:15 ` [PATCH 6/6] udf: " John Kacur
2010-05-05 14:39 ` Jan Kara
2010-05-11 7:08 ` [PATCH 0/6] " Frederic Weisbecker
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=1273065339-21669-3-git-send-email-jkacur@redhat.com \
--to=jkacur@redhat.com \
--cc=arnd@arndb.de \
--cc=coda@cs.cmu.edu \
--cc=fweisbec@gmail.com \
--cc=jaharkes@cs.cmu.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®