diff options
author | Dave Chinner | 2016-03-06 23:34:54 +0100 |
---|---|---|
committer | Dave Chinner | 2016-03-06 23:34:54 +0100 |
commit | 3c1a79f5fff9b5ef653dc8b900ce818860c1f710 (patch) | |
tree | 9d955a4a921a3c08082f15da740fe369647c32dd /fs/xfs/libxfs/xfs_bmap.c | |
parent | Merge branch 'xfs-dax-fixes-4.6' into for-next (diff) | |
parent | xfs: remove xfs_trans_get_block_res (diff) | |
download | kernel-qcow2-linux-3c1a79f5fff9b5ef653dc8b900ce818860c1f710.tar.gz kernel-qcow2-linux-3c1a79f5fff9b5ef653dc8b900ce818860c1f710.tar.xz kernel-qcow2-linux-3c1a79f5fff9b5ef653dc8b900ce818860c1f710.zip |
Merge branch 'xfs-misc-fixes-4.6-2' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_bmap.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 6a051662d8f9..cb58d728a4d0 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5210,7 +5210,7 @@ xfs_bunmapi( * This is better than zeroing it. */ ASSERT(del.br_state == XFS_EXT_NORM); - ASSERT(xfs_trans_get_block_res(tp) > 0); + ASSERT(tp->t_blk_res > 0); /* * If this spans a realtime extent boundary, * chop it back to the start of the one we end at. @@ -5241,7 +5241,7 @@ xfs_bunmapi( del.br_startblock += mod; } else if ((del.br_startoff == start && (del.br_state == XFS_EXT_UNWRITTEN || - xfs_trans_get_block_res(tp) == 0)) || + tp->t_blk_res == 0)) || !xfs_sb_version_hasextflgbit(&mp->m_sb)) { /* * Can't make it unwritten. There isn't @@ -5332,7 +5332,7 @@ xfs_bunmapi( * conversion to btree format, since the transaction * will be dirty. */ - if (!wasdel && xfs_trans_get_block_res(tp) == 0 && + if (!wasdel && tp->t_blk_res == 0 && XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS && XFS_IFORK_NEXTENTS(ip, whichfork) >= /* Note the >= */ XFS_IFORK_MAXEXT(ip, whichfork) && |