Merge branch 'xfs-misc-fixes-4.6-3' into for-next

[mirror_ubuntu-bionic-kernel.git] / fs / xfs / libxfs / xfs_bmap.c

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 6a051662d8f9b2d0dfb184689ddc9130cd9bec74..79e898cb5562c1278e8831c3f7128d16f2ced8ba 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -477,10 +477,7 @@ xfs_bmap_check_leaf_extents(
                }
                block = XFS_BUF_TO_BLOCK(bp);
        }
-       if (bp_release) {
-               bp_release = 0;
-               xfs_trans_brelse(NULL, bp);
-       }
+
        return;
 
 error0:
@@ -5210,7 +5207,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 +5238,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 +5329,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) &&