From: kbuild test robot Date: Sun, 30 Nov 2014 21:25:28 +0000 (+1100) Subject: xfs: fix simple_return.cocci warning in xfs_file_readdir X-Git-Tag: v3.19-rc1~108^2~1^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8300475ebf03a54ec3c56b6b808ccbd9e1bc320d;p=karo-tx-linux.git xfs: fix simple_return.cocci warning in xfs_file_readdir 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 Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index eb596b419942..5f467cf21c26 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -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