summaryrefslogtreecommitdiff
path: root/fs/xfs/libxfs/xfs_bmap.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-12-01 01:03:02 +0300
committerDave Chinner <david@fromorbit.com>2014-12-01 01:03:02 +0300
commitc14fc01340dd0afe58d8671acc3ea5e907e707ae (patch)
tree15d26839e5ab12a186e1ad7265020ba6112ac639 /fs/xfs/libxfs/xfs_bmap.c
parent216875a594e0b4fc72830e3690b8fbe7430738e2 (diff)
parentd254aaec5d1aa2997dad035db340c298eaa8d089 (diff)
downloadlinux-c14fc01340dd0afe58d8671acc3ea5e907e707ae.tar.xz
Merge branch 'xfs-coccinelle-cleanups' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_bmap.c')
-rw-r--r--fs/xfs/libxfs/xfs_bmap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index c2a36c331b9c..80e33888ecc6 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5589,12 +5589,8 @@ shift_extent:
XFS_WANT_CORRUPTED_GOTO(i == 1, out_error);
got.br_startoff = startoff;
- error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
+ return xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
got.br_blockcount, got.br_state);
- if (error)
- return error;
-
- return 0;
out_error:
return error;