Unionfs: minor coding style updates

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index f6785344e38719701ba82ce7ae6a7a9589acf7e4..2d15fb0fb869b7b130b90dd8d7ca0154fc41bb52 100644 (file)
--- a/fs/unionfs/debug.c
+++ b/fs/unionfs/debug.c
@@ -467,7 +467,8 @@ void __show_dinode_times(const struct dentry *dentry,
                lower_inode = unionfs_lower_inode_idx(inode, bindex);
                if (!lower_inode)
                        continue;
-               printk("DT(%s:%lu:%d): ", dentry->d_name.name, inode->i_ino, bindex);
+               printk("DT(%s:%lu:%d): ", dentry->d_name.name, inode->i_ino,
+                      bindex);
                printk("%s:%s:%d ",file,fxn,line);
                printk("um=%lu/%lu lm=%lu/%lu ",
                       inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec,
@@ -490,7 +491,8 @@ void __show_inode_counts(const struct inode *inode,
                printk("SiC: Null inode\n");
                return;
        }
-       for (bindex=sbstart(inode->i_sb); bindex <= sbend(inode->i_sb); bindex++) {
+       for (bindex=sbstart(inode->i_sb); bindex <= sbend(inode->i_sb);
+            bindex++) {
                lower_inode = unionfs_lower_inode_idx(inode, bindex);
                if (!lower_inode)
                        continue;

diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index 08b572267dbdf1a2c0ed854491f0bad65e288ba1..d9bb199617232e768ccd7db203f67f7959a1c677 100644 (file)
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -26,7 +26,7 @@
  * Returns true if valid, false otherwise.
  */
 static bool __unionfs_d_revalidate_one(struct dentry *dentry,
-                                     struct nameidata *nd)
+                                      struct nameidata *nd)
 {
        bool valid = true;      /* default is valid */
        struct dentry *lower_dentry;

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 9638b64aed384ba8c1ce97b80a362cdc5a7801f4..de78e269a78a41297f07bc54f0942fac1e631b04 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -99,7 +99,8 @@ static int unionfs_create(struct inode *parent, struct dentry *dentry,
                 * if lower_dentry is NULL, create the entire
                 * dentry directory structure in branch 0.
                 */
-               lower_dentry = create_parents(parent, dentry, dentry->d_name.name, 0);
+               lower_dentry = create_parents(parent, dentry,
+                                             dentry->d_name.name, 0);
                if (IS_ERR(lower_dentry)) {
                        err = PTR_ERR(lower_dentry);
                        goto out;
@@ -447,9 +448,8 @@ static int unionfs_symlink(struct inode *dir, struct dentry *dentry,
 
                if (!(err = is_robranch_super(dentry->d_sb, bindex))) {
                        mode = S_IALLUGO;
-                       err =
-                               vfs_symlink(lower_dir_dentry->d_inode,
-                                           lower_dentry, symname, mode);
+                       err = vfs_symlink(lower_dir_dentry->d_inode,
+                                         lower_dentry, symname, mode);
                }
                unlock_dir(lower_dir_dentry);
 
@@ -884,9 +884,11 @@ static void unionfs_put_link(struct dentry *dentry, struct nameidata *nd,
  *       readonly, to allow copyup to work.
  *   (3) we do call security_inode_permission, and therefore security inside
  *       SELinux, etc. are performed.
+ *
+ * @inode: the lower inode we're checking permission on
  */
-static int inode_permission(struct super_block *sb, struct inode *inode, int mask,
-                           struct nameidata *nd, int bindex)
+static int inode_permission(struct super_block *sb, struct inode *inode,
+                           int mask, struct nameidata *nd, int bindex)
 {
        int retval, submask;
 

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 4faae44336a0dd639629669b827fca4041f7ef1c..85957509516d0d26733f54d362458fecf165fdd0 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -275,14 +275,14 @@ int __parse_branch_mode(const char *name)
  */
 int parse_branch_mode(const char *name)
 {
-       int perms =  __parse_branch_mode(name);
+       int perms = __parse_branch_mode(name);
 
        if (perms == 0)
                perms = MAY_READ | MAY_WRITE;
        return perms;
 }
 
-/* 
+/*
  * parse the dirs= mount argument
  *
  * We don't need to lock the superblock private data's rwsem, as we get

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 9ec5f82f378b2f6a38f7d753b2d605aa889d0751..178bdfc5445476f04a5fae3c2149b033e7095e44 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -553,7 +553,7 @@ extern void __show_inode_counts(const struct inode *inode,
 
 /* we leave useful hooks for these check functions throughout the code */
 #define unionfs_check_inode(i)         do { } while(0)
-#define unionfs_check_dentry(d)        do { } while(0)
+#define unionfs_check_dentry(d)                do { } while(0)
 #define unionfs_check_file(f)          do { } while(0)
 #define show_branch_counts(sb)         do { } while(0)
 #define show_inode_times(i)            do { } while(0)