Unionfs: minor coding standards applied

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

diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index f32dfa9bd22801301d733417d00699e52db1edb1..0c22346589e76664bafa75227ab76997eafefa26 100644 (file)
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -454,8 +454,8 @@ int copyup_dentry(struct inode *dir, struct dentry *dentry, int bstart,
                goto out_unlink;
 
        /* Set permissions. */
-       if ((err = copyup_permissions(sb, old_lower_dentry,
-                                     new_lower_dentry)))
+       err = copyup_permissions(sb, old_lower_dentry, new_lower_dentry);
+       if (err)
                goto out_unlink;
 
 #ifdef CONFIG_UNION_FS_XATTR

diff --git a/fs/unionfs/dirfops.c b/fs/unionfs/dirfops.c
index 9cde48fe57a40999735d774b0bb202de4fc159d6..e38ebef7310561cb590face3df4566af453a29eb 100644 (file)
--- a/fs/unionfs/dirfops.c
+++ b/fs/unionfs/dirfops.c
@@ -77,8 +77,9 @@ static int unionfs_filldir(void *dirent, const char *name, int namelen,
                goto out;
        }
        buf->entries_written++;
-       if ((err = add_filldir_node(buf->rdstate, name, namelen,
-                                   buf->rdstate->bindex, is_wh_entry)))
+       err = add_filldir_node(buf->rdstate, name, namelen,
+                              buf->rdstate->bindex, is_wh_entry);
+       if (err)
                buf->filldir_error = err;
 
 out: