|
@@ -918,7 +918,6 @@ xfs_bmap_add_attrfork_btree(
|
|
|
xfs_trans_t *tp, /* transaction pointer */
|
|
|
xfs_inode_t *ip, /* incore inode pointer */
|
|
|
xfs_fsblock_t *firstblock, /* first block allocated */
|
|
|
- struct xfs_defer_ops *dfops, /* blocks to free at commit */
|
|
|
int *flags) /* inode logging flags */
|
|
|
{
|
|
|
xfs_btree_cur_t *cur; /* btree cursor */
|
|
@@ -931,7 +930,7 @@ xfs_bmap_add_attrfork_btree(
|
|
|
*flags |= XFS_ILOG_DBROOT;
|
|
|
else {
|
|
|
cur = xfs_bmbt_init_cursor(mp, tp, ip, XFS_DATA_FORK);
|
|
|
- cur->bc_private.b.dfops = dfops;
|
|
|
+ cur->bc_private.b.dfops = tp->t_dfops;
|
|
|
cur->bc_private.b.firstblock = *firstblock;
|
|
|
error = xfs_bmbt_lookup_first(cur, &stat);
|
|
|
if (error)
|
|
@@ -962,7 +961,6 @@ xfs_bmap_add_attrfork_extents(
|
|
|
xfs_trans_t *tp, /* transaction pointer */
|
|
|
xfs_inode_t *ip, /* incore inode pointer */
|
|
|
xfs_fsblock_t *firstblock, /* first block allocated */
|
|
|
- struct xfs_defer_ops *dfops, /* blocks to free at commit */
|
|
|
int *flags) /* inode logging flags */
|
|
|
{
|
|
|
xfs_btree_cur_t *cur; /* bmap btree cursor */
|
|
@@ -971,7 +969,7 @@ xfs_bmap_add_attrfork_extents(
|
|
|
if (ip->i_d.di_nextents * sizeof(xfs_bmbt_rec_t) <= XFS_IFORK_DSIZE(ip))
|
|
|
return 0;
|
|
|
cur = NULL;
|
|
|
- error = xfs_bmap_extents_to_btree(tp, ip, firstblock, dfops, &cur, 0,
|
|
|
+ error = xfs_bmap_extents_to_btree(tp, ip, firstblock, tp->t_dfops, &cur, 0,
|
|
|
flags, XFS_DATA_FORK);
|
|
|
if (cur) {
|
|
|
cur->bc_private.b.allocated = 0;
|
|
@@ -997,7 +995,6 @@ xfs_bmap_add_attrfork_local(
|
|
|
xfs_trans_t *tp, /* transaction pointer */
|
|
|
xfs_inode_t *ip, /* incore inode pointer */
|
|
|
xfs_fsblock_t *firstblock, /* first block allocated */
|
|
|
- struct xfs_defer_ops *dfops, /* blocks to free at commit */
|
|
|
int *flags) /* inode logging flags */
|
|
|
{
|
|
|
xfs_da_args_t dargs; /* args for dir/attr code */
|
|
@@ -1010,7 +1007,7 @@ xfs_bmap_add_attrfork_local(
|
|
|
dargs.geo = ip->i_mount->m_dir_geo;
|
|
|
dargs.dp = ip;
|
|
|
dargs.firstblock = firstblock;
|
|
|
- dargs.dfops = dfops;
|
|
|
+ dargs.dfops = tp->t_dfops;
|
|
|
dargs.total = dargs.geo->fsbcount;
|
|
|
dargs.whichfork = XFS_DATA_FORK;
|
|
|
dargs.trans = tp;
|
|
@@ -1108,16 +1105,16 @@ xfs_bmap_add_attrfork(
|
|
|
logflags = 0;
|
|
|
switch (ip->i_d.di_format) {
|
|
|
case XFS_DINODE_FMT_LOCAL:
|
|
|
- error = xfs_bmap_add_attrfork_local(tp, ip, &firstblock, &dfops,
|
|
|
- &logflags);
|
|
|
+ error = xfs_bmap_add_attrfork_local(tp, ip, &firstblock,
|
|
|
+ &logflags);
|
|
|
break;
|
|
|
case XFS_DINODE_FMT_EXTENTS:
|
|
|
error = xfs_bmap_add_attrfork_extents(tp, ip, &firstblock,
|
|
|
- &dfops, &logflags);
|
|
|
+ &logflags);
|
|
|
break;
|
|
|
case XFS_DINODE_FMT_BTREE:
|
|
|
- error = xfs_bmap_add_attrfork_btree(tp, ip, &firstblock, &dfops,
|
|
|
- &logflags);
|
|
|
+ error = xfs_bmap_add_attrfork_btree(tp, ip, &firstblock,
|
|
|
+ &logflags);
|
|
|
break;
|
|
|
default:
|
|
|
error = 0;
|