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/libxfs | |
| parent | 216875a594e0b4fc72830e3690b8fbe7430738e2 (diff) | |
| parent | d254aaec5d1aa2997dad035db340c298eaa8d089 (diff) | |
| download | op-kernel-dev-c14fc01340dd0afe58d8671acc3ea5e907e707ae.zip op-kernel-dev-c14fc01340dd0afe58d8671acc3ea5e907e707ae.tar.gz | |
Merge branch 'xfs-coccinelle-cleanups' into for-next
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 6 | ||||
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index c2a36c3..80e3388 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; diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 92d2617..d1dc590 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -1134,11 +1134,7 @@ xfs_dialloc_ag_update_inobt( XFS_WANT_CORRUPTED_RETURN((rec.ir_free == frec->ir_free) && (rec.ir_freecount == frec->ir_freecount)); - error = xfs_inobt_update(cur, &rec); - if (error) - return error; - - return 0; + return xfs_inobt_update(cur, &rec); } /* |
