aboutsummaryrefslogtreecommitdiffstats
path: root/fs/coda
diff options
context:
space:
mode:
authorJohn Kacur <jkacur@redhat.com>2010-05-05 15:15:35 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2010-05-17 05:27:41 +0200
commit1977bb2ed8ffdd161fe1c9eef1f9fd283e41d4b5 (patch)
treeffa1e99c35241e5886fb8c96a7b56f6703558629 /fs/coda
parent2ff82f852189226cda3cb192985a4a7fc750ab26 (diff)
downloadkernel_samsung_aries-1977bb2ed8ffdd161fe1c9eef1f9fd283e41d4b5.zip
kernel_samsung_aries-1977bb2ed8ffdd161fe1c9eef1f9fd283e41d4b5.tar.gz
kernel_samsung_aries-1977bb2ed8ffdd161fe1c9eef1f9fd283e41d4b5.tar.bz2
coda: Clean-up whitespace problems in pioctl.c
Signed-off-by: John Kacur <jkacur@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'fs/coda')
-rw-r--r--fs/coda/pioctl.c35
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;
}