diff options
author | kbuild test robot <fengguang.wu@intel.com> | 2014-11-30 16:25:28 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-11-30 16:25:28 -0500 |
commit | 8300475ebf03a54ec3c56b6b808ccbd9e1bc320d (patch) | |
tree | cf3cf8207847e0edfd3cec7771cbc460c6c6318e /fs | |
parent | b72091f2fb28fb9e2746010b54d6cc3c27924e6c (diff) |
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 <fengguang.wu@intel.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/xfs/xfs_file.c | 6 |
1 files changed, 1 insertions, 5 deletions
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( | |||
933 | { | 933 | { |
934 | struct inode *inode = file_inode(file); | 934 | struct inode *inode = file_inode(file); |
935 | xfs_inode_t *ip = XFS_I(inode); | 935 | xfs_inode_t *ip = XFS_I(inode); |
936 | int error; | ||
937 | size_t bufsize; | 936 | size_t bufsize; |
938 | 937 | ||
939 | /* | 938 | /* |
@@ -950,10 +949,7 @@ xfs_file_readdir( | |||
950 | */ | 949 | */ |
951 | bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size); | 950 | bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size); |
952 | 951 | ||
953 | error = xfs_readdir(ip, ctx, bufsize); | 952 | return xfs_readdir(ip, ctx, bufsize); |
954 | if (error) | ||
955 | return error; | ||
956 | return 0; | ||
957 | } | 953 | } |
958 | 954 | ||
959 | STATIC int | 955 | STATIC int |