Unionfs: remove unnecessary if condition
authorErez Zadok <ezk@cs.sunysb.edu>
Sat, 29 Sep 2007 05:36:57 +0000 (01:36 -0400)
committerErez Zadok <ezk@cs.sunysb.edu>
Fri, 12 Aug 2011 02:36:25 +0000 (22:36 -0400)
The condition is always true there.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
fs/unionfs/dirfops.c

index 200fb550c1e6d80afa60be2ae5d9e1f18c1af739..da0fcdb2f61bd3787ffa722c104cbdb8342bb4c5 100644 (file)
@@ -63,12 +63,10 @@ static int unionfs_filldir(void *dirent, const char *name, int namelen,
                off_t pos = rdstate2offset(buf->rdstate);
                u64 unionfs_ino = ino;
 
-               if (!err) {
-                       err = buf->filldir(buf->dirent, name, namelen, pos,
-                                          unionfs_ino, d_type);
-                       buf->rdstate->offset++;
-                       verify_rdstate_offset(buf->rdstate);
-               }
+               err = buf->filldir(buf->dirent, name, namelen, pos,
+                                  unionfs_ino, d_type);
+               buf->rdstate->offset++;
+               verify_rdstate_offset(buf->rdstate);
        }
        /*
         * If we did fill it, stuff it in our hash, otherwise return an