leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: remove xfs_trans_get_block_res

Browse Source 
Just use the t_blk_res field directly instead of obsfucating the reference
by a macro.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig
2016-03-02 09:58:21 +11:00
committed by Dave Chinner
parent 12c3f05c7b
commit a7e5d03ba8
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/libxfs/xfs_bmap.c
View File

@@ -5210,7 +5210,7 @@ xfs_bunmapi(
* This is better than zeroing it. * This is better than zeroing it.
*/ */
ASSERT(del.br_state == XFS_EXT_NORM); 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, * If this spans a realtime extent boundary,
* chop it back to the start of the one we end at. * chop it back to the start of the one we end at.
@@ -5241,7 +5241,7 @@ xfs_bunmapi(
del.br_startblock += mod; del.br_startblock += mod;
} else if ((del.br_startoff == start && } else if ((del.br_startoff == start &&
(del.br_state == XFS_EXT_UNWRITTEN || (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)) { !xfs_sb_version_hasextflgbit(&mp->m_sb)) {
/* /*
* Can't make it unwritten. There isn't * Can't make it unwritten. There isn't
@@ -5332,7 +5332,7 @@ xfs_bunmapi(
* conversion to btree format, since the transaction * conversion to btree format, since the transaction
* will be dirty. * 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_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS &&
XFS_IFORK_NEXTENTS(ip, whichfork) >= /* Note the >= */ XFS_IFORK_NEXTENTS(ip, whichfork) >= /* Note the >= */
XFS_IFORK_MAXEXT(ip, whichfork) && XFS_IFORK_MAXEXT(ip, whichfork) &&

4
fs/xfs/libxfs/xfs_bmap_btree.c
View File

@@ -461,7 +461,7 @@ xfs_bmbt_alloc_block(
* reservation amount is insufficient then we may fail a * reservation amount is insufficient then we may fail a
* block allocation here and corrupt the filesystem. * block allocation here and corrupt the filesystem.
*/ */
args.minleft = xfs_trans_get_block_res(args.tp); args.minleft = args.tp->t_blk_res;
} else if (cur->bc_private.b.flist->xbf_low) { } else if (cur->bc_private.b.flist->xbf_low) {
args.type = XFS_ALLOCTYPE_START_BNO; args.type = XFS_ALLOCTYPE_START_BNO;
} else { } else {
@@ -470,7 +470,7 @@ xfs_bmbt_alloc_block(
args.minlen = args.maxlen = args.prod = 1; args.minlen = args.maxlen = args.prod = 1;
args.wasdel = cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL; args.wasdel = cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL;
if (!args.wasdel && xfs_trans_get_block_res(args.tp) == 0) { if (!args.wasdel && args.tp->t_blk_res == 0) {
error = -ENOSPC; error = -ENOSPC;
goto error0; goto error0;
} }

1
fs/xfs/xfs_trans.h
View File

@@ -133,7 +133,6 @@ typedef struct xfs_trans {
* XFS transaction mechanism exported interfaces that are * XFS transaction mechanism exported interfaces that are
* actually macros. * actually macros.
*/ */
#define xfs_trans_get_block_res(tp) ((tp)->t_blk_res)
#define xfs_trans_set_sync(tp) ((tp)->t_flags |= XFS_TRANS_SYNC) #define xfs_trans_set_sync(tp) ((tp)->t_flags |= XFS_TRANS_SYNC)
#if defined(DEBUG) || defined(XFS_WARN) #if defined(DEBUG) || defined(XFS_WARN)