diff options
| author |   Dave Chinner <david@fromorbit.com> | 2014-12-01 09:03:02 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-12-01 09:03:02 +1100 |
| commit | c14fc01340dd0afe58d8671acc3ea5e907e707ae (patch) | |
| tree | 15d26839e5ab12a186e1ad7265020ba6112ac639 /fs/xfs/xfs_file.c | |
| parent | Merge branch 'xfs-consolidate-format-defs' into for-next (diff) | |
| parent | xfs: fix simple_return.cocci warning in xfs_bmse_shift_one (diff) | |
| download | linux-dev-c14fc01340dd0afe58d8671acc3ea5e907e707ae.tar.xz linux-dev-c14fc01340dd0afe58d8671acc3ea5e907e707ae.zip | |
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( { struct inode *inode = file_inode(file); xfs_inode_t *ip = XFS_I(inode); - int error; size_t bufsize; /* @@ -947,10 +946,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 |