]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
xfs: fix simple_return.cocci warning in xfs_file_readdir
authorkbuild test robot <fengguang.wu@intel.com>
Sun, 30 Nov 2014 21:25:28 +0000 (08:25 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 30 Nov 2014 21:25:28 +0000 (08:25 +1100)
fs/xfs/xfs_file.c:919:1-6: WARNING: end returns can be simpified and declaration on line 902 can be dropped

 Simplify a trivial if-return sequence.  Possibly combine with a
 preceding function call.
Generated by: scripts/coccinelle/misc/simple_return.cocci

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_file.c

index eb596b4199420fa8378dcd49146640c9783037b4..5f467cf21c26447b48bf645d4a5b3b4f8edff8d4 100644 (file)
@@ -933,7 +933,6 @@ xfs_file_readdir(
 {
        struct inode    *inode = file_inode(file);
        xfs_inode_t     *ip = XFS_I(inode);
-       int             error;
        size_t          bufsize;
 
        /*
@@ -950,10 +949,7 @@ xfs_file_readdir(
         */
        bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size);
 
-       error = xfs_readdir(ip, ctx, bufsize);
-       if (error)
-               return error;
-       return 0;
+       return xfs_readdir(ip, ctx, bufsize);
 }
 
 STATIC int