Merge branch 'xfs-coccinelle-cleanups' into for-next

2014-12-01 09:03:02 +11:00
parent 216875a594 d254aaec5d
commit c14fc01340
5 changed files with 9 additions and 24 deletions
--- 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;