xfs: remove xfs_bmapi_write() dfops param
Now that all callers use ->t_dfops, the xfs_bmapi_write() dfops parameter is no longer necessary. Remove it and access ->t_dfops directly. This patch does not change behavior. Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Родитель
175d1a013e
Коммит
6e702a5dcb
|
@ -484,8 +484,7 @@ xfs_attr_rmtval_set(
|
||||||
nmap = 1;
|
nmap = 1;
|
||||||
error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)lblkno,
|
error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)lblkno,
|
||||||
blkcnt, XFS_BMAPI_ATTRFORK, args->firstblock,
|
blkcnt, XFS_BMAPI_ATTRFORK, args->firstblock,
|
||||||
args->total, &map, &nmap,
|
args->total, &map, &nmap);
|
||||||
args->trans->t_dfops);
|
|
||||||
if (error)
|
if (error)
|
||||||
goto out_defer_cancel;
|
goto out_defer_cancel;
|
||||||
xfs_defer_ijoin(args->trans->t_dfops, dp);
|
xfs_defer_ijoin(args->trans->t_dfops, dp);
|
||||||
|
|
|
@ -4245,8 +4245,7 @@ xfs_bmapi_write(
|
||||||
controls a.g. for allocs */
|
controls a.g. for allocs */
|
||||||
xfs_extlen_t total, /* total blocks needed */
|
xfs_extlen_t total, /* total blocks needed */
|
||||||
struct xfs_bmbt_irec *mval, /* output: map values */
|
struct xfs_bmbt_irec *mval, /* output: map values */
|
||||||
int *nmap, /* i/o: mval size/count */
|
int *nmap) /* i/o: mval size/count */
|
||||||
struct xfs_defer_ops *dfops) /* i/o: list extents to free */
|
|
||||||
{
|
{
|
||||||
struct xfs_mount *mp = ip->i_mount;
|
struct xfs_mount *mp = ip->i_mount;
|
||||||
struct xfs_ifork *ifp;
|
struct xfs_ifork *ifp;
|
||||||
|
@ -4337,7 +4336,7 @@ xfs_bmapi_write(
|
||||||
bma.ip = ip;
|
bma.ip = ip;
|
||||||
bma.total = total;
|
bma.total = total;
|
||||||
bma.datatype = 0;
|
bma.datatype = 0;
|
||||||
bma.dfops = dfops;
|
bma.dfops = tp ? tp->t_dfops : NULL;
|
||||||
bma.firstblock = firstblock;
|
bma.firstblock = firstblock;
|
||||||
|
|
||||||
while (bno < end && n < *nmap) {
|
while (bno < end && n < *nmap) {
|
||||||
|
@ -4414,8 +4413,9 @@ xfs_bmapi_write(
|
||||||
* the refcount btree for orphan recovery.
|
* the refcount btree for orphan recovery.
|
||||||
*/
|
*/
|
||||||
if (whichfork == XFS_COW_FORK) {
|
if (whichfork == XFS_COW_FORK) {
|
||||||
error = xfs_refcount_alloc_cow_extent(mp, dfops,
|
error = xfs_refcount_alloc_cow_extent(mp,
|
||||||
bma.blkno, bma.length);
|
tp->t_dfops, bma.blkno,
|
||||||
|
bma.length);
|
||||||
if (error)
|
if (error)
|
||||||
goto error0;
|
goto error0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -203,8 +203,7 @@ int xfs_bmapi_read(struct xfs_inode *ip, xfs_fileoff_t bno,
|
||||||
int xfs_bmapi_write(struct xfs_trans *tp, struct xfs_inode *ip,
|
int xfs_bmapi_write(struct xfs_trans *tp, struct xfs_inode *ip,
|
||||||
xfs_fileoff_t bno, xfs_filblks_t len, int flags,
|
xfs_fileoff_t bno, xfs_filblks_t len, int flags,
|
||||||
xfs_fsblock_t *firstblock, xfs_extlen_t total,
|
xfs_fsblock_t *firstblock, xfs_extlen_t total,
|
||||||
struct xfs_bmbt_irec *mval, int *nmap,
|
struct xfs_bmbt_irec *mval, int *nmap);
|
||||||
struct xfs_defer_ops *dfops);
|
|
||||||
int __xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode *ip,
|
int __xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode *ip,
|
||||||
xfs_fileoff_t bno, xfs_filblks_t *rlen, int flags,
|
xfs_fileoff_t bno, xfs_filblks_t *rlen, int flags,
|
||||||
xfs_extnum_t nexts, xfs_fsblock_t *firstblock,
|
xfs_extnum_t nexts, xfs_fsblock_t *firstblock,
|
||||||
|
|
|
@ -2062,8 +2062,7 @@ xfs_da_grow_inode_int(
|
||||||
ASSERT(args->firstblock != NULL);
|
ASSERT(args->firstblock != NULL);
|
||||||
error = xfs_bmapi_write(tp, dp, *bno, count,
|
error = xfs_bmapi_write(tp, dp, *bno, count,
|
||||||
xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG,
|
xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG,
|
||||||
args->firstblock, args->total, &map, &nmap,
|
args->firstblock, args->total, &map, &nmap);
|
||||||
args->trans->t_dfops);
|
|
||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
|
@ -2086,8 +2085,7 @@ xfs_da_grow_inode_int(
|
||||||
error = xfs_bmapi_write(tp, dp, b, c,
|
error = xfs_bmapi_write(tp, dp, b, c,
|
||||||
xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA,
|
xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA,
|
||||||
args->firstblock, args->total,
|
args->firstblock, args->total,
|
||||||
&mapp[mapi], &nmap,
|
&mapp[mapi], &nmap);
|
||||||
args->trans->t_dfops);
|
|
||||||
if (error)
|
if (error)
|
||||||
goto out_free_map;
|
goto out_free_map;
|
||||||
if (nmap < 1)
|
if (nmap < 1)
|
||||||
|
|
|
@ -976,7 +976,7 @@ xfs_alloc_file_space(
|
||||||
tp->t_dfops = &dfops;
|
tp->t_dfops = &dfops;
|
||||||
error = xfs_bmapi_write(tp, ip, startoffset_fsb,
|
error = xfs_bmapi_write(tp, ip, startoffset_fsb,
|
||||||
allocatesize_fsb, alloc_type, &firstfsb,
|
allocatesize_fsb, alloc_type, &firstfsb,
|
||||||
resblks, imapp, &nimaps, tp->t_dfops);
|
resblks, imapp, &nimaps);
|
||||||
if (error)
|
if (error)
|
||||||
goto error0;
|
goto error0;
|
||||||
|
|
||||||
|
|
|
@ -313,7 +313,7 @@ xfs_dquot_disk_alloc(
|
||||||
error = xfs_bmapi_write(tp, quotip, dqp->q_fileoffset,
|
error = xfs_bmapi_write(tp, quotip, dqp->q_fileoffset,
|
||||||
XFS_DQUOT_CLUSTER_SIZE_FSB, XFS_BMAPI_METADATA,
|
XFS_DQUOT_CLUSTER_SIZE_FSB, XFS_BMAPI_METADATA,
|
||||||
&firstblock, XFS_QM_DQALLOC_SPACE_RES(mp),
|
&firstblock, XFS_QM_DQALLOC_SPACE_RES(mp),
|
||||||
&map, &nmaps, tp->t_dfops);
|
&map, &nmaps);
|
||||||
if (error)
|
if (error)
|
||||||
goto error0;
|
goto error0;
|
||||||
ASSERT(map.br_blockcount == XFS_DQUOT_CLUSTER_SIZE_FSB);
|
ASSERT(map.br_blockcount == XFS_DQUOT_CLUSTER_SIZE_FSB);
|
||||||
|
|
|
@ -259,7 +259,7 @@ xfs_iomap_write_direct(
|
||||||
nimaps = 1;
|
nimaps = 1;
|
||||||
error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb,
|
error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb,
|
||||||
bmapi_flags, &firstfsb, resblks, imap,
|
bmapi_flags, &firstfsb, resblks, imap,
|
||||||
&nimaps, tp->t_dfops);
|
&nimaps);
|
||||||
if (error)
|
if (error)
|
||||||
goto out_bmap_cancel;
|
goto out_bmap_cancel;
|
||||||
|
|
||||||
|
@ -773,8 +773,7 @@ xfs_iomap_write_allocate(
|
||||||
*/
|
*/
|
||||||
error = xfs_bmapi_write(tp, ip, map_start_fsb,
|
error = xfs_bmapi_write(tp, ip, map_start_fsb,
|
||||||
count_fsb, flags, &first_block,
|
count_fsb, flags, &first_block,
|
||||||
nres, imap, &nimaps,
|
nres, imap, &nimaps);
|
||||||
tp->t_dfops);
|
|
||||||
if (error)
|
if (error)
|
||||||
goto trans_cancel;
|
goto trans_cancel;
|
||||||
|
|
||||||
|
@ -884,7 +883,7 @@ xfs_iomap_write_unwritten(
|
||||||
nimaps = 1;
|
nimaps = 1;
|
||||||
error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb,
|
error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb,
|
||||||
XFS_BMAPI_CONVERT, &firstfsb, resblks,
|
XFS_BMAPI_CONVERT, &firstfsb, resblks,
|
||||||
&imap, &nimaps, tp->t_dfops);
|
&imap, &nimaps);
|
||||||
if (error)
|
if (error)
|
||||||
goto error_on_bmapi_transaction;
|
goto error_on_bmapi_transaction;
|
||||||
|
|
||||||
|
|
|
@ -326,7 +326,7 @@ xfs_reflink_convert_cow_extent(
|
||||||
return 0;
|
return 0;
|
||||||
return xfs_bmapi_write(NULL, ip, imap->br_startoff, imap->br_blockcount,
|
return xfs_bmapi_write(NULL, ip, imap->br_startoff, imap->br_blockcount,
|
||||||
XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT, &first_block,
|
XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT, &first_block,
|
||||||
0, imap, &nimaps, NULL);
|
0, imap, &nimaps);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Convert all of the unwritten CoW extents in a file's range to real ones. */
|
/* Convert all of the unwritten CoW extents in a file's range to real ones. */
|
||||||
|
@ -349,8 +349,8 @@ xfs_reflink_convert_cow(
|
||||||
xfs_ilock(ip, XFS_ILOCK_EXCL);
|
xfs_ilock(ip, XFS_ILOCK_EXCL);
|
||||||
error = xfs_bmapi_write(NULL, ip, offset_fsb, count_fsb,
|
error = xfs_bmapi_write(NULL, ip, offset_fsb, count_fsb,
|
||||||
XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT |
|
XFS_BMAPI_COWFORK | XFS_BMAPI_CONVERT |
|
||||||
XFS_BMAPI_CONVERT_ONLY, &first_block, 0, &imap, &nimaps,
|
XFS_BMAPI_CONVERT_ONLY, &first_block, 0, &imap,
|
||||||
NULL);
|
&nimaps);
|
||||||
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
@ -435,7 +435,7 @@ retry:
|
||||||
/* Allocate the entire reservation as unwritten blocks. */
|
/* Allocate the entire reservation as unwritten blocks. */
|
||||||
error = xfs_bmapi_write(tp, ip, imap->br_startoff, imap->br_blockcount,
|
error = xfs_bmapi_write(tp, ip, imap->br_startoff, imap->br_blockcount,
|
||||||
XFS_BMAPI_COWFORK | XFS_BMAPI_PREALLOC, &first_block,
|
XFS_BMAPI_COWFORK | XFS_BMAPI_PREALLOC, &first_block,
|
||||||
resblks, imap, &nimaps, tp->t_dfops);
|
resblks, imap, &nimaps);
|
||||||
if (error)
|
if (error)
|
||||||
goto out_bmap_cancel;
|
goto out_bmap_cancel;
|
||||||
|
|
||||||
|
|
|
@ -795,7 +795,7 @@ xfs_growfs_rt_alloc(
|
||||||
nmap = 1;
|
nmap = 1;
|
||||||
error = xfs_bmapi_write(tp, ip, oblocks, nblocks - oblocks,
|
error = xfs_bmapi_write(tp, ip, oblocks, nblocks - oblocks,
|
||||||
XFS_BMAPI_METADATA, &firstblock,
|
XFS_BMAPI_METADATA, &firstblock,
|
||||||
resblks, &map, &nmap, tp->t_dfops);
|
resblks, &map, &nmap);
|
||||||
if (!error && nmap < 1)
|
if (!error && nmap < 1)
|
||||||
error = -ENOSPC;
|
error = -ENOSPC;
|
||||||
if (error)
|
if (error)
|
||||||
|
|
|
@ -291,7 +291,7 @@ xfs_symlink(
|
||||||
|
|
||||||
error = xfs_bmapi_write(tp, ip, first_fsb, fs_blocks,
|
error = xfs_bmapi_write(tp, ip, first_fsb, fs_blocks,
|
||||||
XFS_BMAPI_METADATA, &first_block, resblks,
|
XFS_BMAPI_METADATA, &first_block, resblks,
|
||||||
mval, &nmaps, tp->t_dfops);
|
mval, &nmaps);
|
||||||
if (error)
|
if (error)
|
||||||
goto out_bmap_cancel;
|
goto out_bmap_cancel;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче