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 b04ac2bd9e2c9976d466a2cf8218627cf6ff2af9..153599d11a8bce56c253bdced22c12ddf2ce374c 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 c0cabd6cffe8c5de42296e17c27ff765f744af0d..4c47a43668811c6684de254926342cc171ad6057 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: