diff options
author | Dave Chinner <david@fromorbit.com> | 2014-11-30 17:03:02 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-11-30 17:03:02 -0500 |
commit | c14fc01340dd0afe58d8671acc3ea5e907e707ae (patch) | |
tree | 15d26839e5ab12a186e1ad7265020ba6112ac639 /fs/xfs/xfs_file.c | |
parent | 216875a594e0b4fc72830e3690b8fbe7430738e2 (diff) | |
parent | d254aaec5d1aa2997dad035db340c298eaa8d089 (diff) |
Merge branch 'xfs-coccinelle-cleanups' into for-next
Diffstat (limited to 'fs/xfs/xfs_file.c')
-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 e2b1a8116f1c..13e974e6a889 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c | |||
@@ -930,7 +930,6 @@ xfs_file_readdir( | |||
930 | { | 930 | { |
931 | struct inode *inode = file_inode(file); | 931 | struct inode *inode = file_inode(file); |
932 | xfs_inode_t *ip = XFS_I(inode); | 932 | xfs_inode_t *ip = XFS_I(inode); |
933 | int error; | ||
934 | size_t bufsize; | 933 | size_t bufsize; |
935 | 934 | ||
936 | /* | 935 | /* |
@@ -947,10 +946,7 @@ xfs_file_readdir( | |||
947 | */ | 946 | */ |
948 | bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size); | 947 | bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size); |
949 | 948 | ||
950 | error = xfs_readdir(ip, ctx, bufsize); | 949 | return xfs_readdir(ip, ctx, bufsize); |
951 | if (error) | ||
952 | return error; | ||
953 | return 0; | ||
954 | } | 950 | } |
955 | 951 | ||
956 | STATIC int | 952 | STATIC int |