xfs: reflink find shared should take a transaction

Adapt _reflink_find_shared to take an optional transaction pointer.  The
inode scrubber code will need to decide (within transaction context) if
a file has shared blocks.  To avoid buffer deadlocks, we must pass the
tp through to this function's utility calls.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 0ea70a44c1a7839541b7b9e333fe3c4fd0372c86..863180c41858402ed1868c0a51892fa51c846dab 100644 (file)
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -455,8 +455,8 @@ xfs_getbmap_adjust_shared(
 
        agno = XFS_FSB_TO_AGNO(mp, map->br_startblock);
        agbno = XFS_FSB_TO_AGBNO(mp, map->br_startblock);
-       error = xfs_reflink_find_shared(mp, agno, agbno, map->br_blockcount,
-                       &ebno, &elen, true);
+       error = xfs_reflink_find_shared(mp, NULL, agno, agbno,
+                       map->br_blockcount, &ebno, &elen, true);
        if (error)
                return error;
 

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index ffe6fe7a7eb546721827bcdb8e810a8777a1455b..e25c9953a7c984511a9308b71793b1812e9de334 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -155,6 +155,7 @@
 int
 xfs_reflink_find_shared(
        struct xfs_mount        *mp,
+       struct xfs_trans        *tp,
        xfs_agnumber_t          agno,
        xfs_agblock_t           agbno,
        xfs_extlen_t            aglen,
@@ -166,18 +167,18 @@ xfs_reflink_find_shared(
        struct xfs_btree_cur    *cur;
        int                     error;
 
-       error = xfs_alloc_read_agf(mp, NULL, agno, 0, &agbp);
+       error = xfs_alloc_read_agf(mp, tp, agno, 0, &agbp);
        if (error)
                return error;
 
-       cur = xfs_refcountbt_init_cursor(mp, NULL, agbp, agno, NULL);
+       cur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno, NULL);
 
        error = xfs_refcount_find_shared(cur, agbno, aglen, fbno, flen,
                        find_end_of_shared);
 
        xfs_btree_del_cursor(cur, error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
 
-       xfs_buf_relse(agbp);
+       xfs_trans_brelse(tp, agbp);
        return error;
 }
 
@@ -217,7 +218,7 @@ xfs_reflink_trim_around_shared(
        agbno = XFS_FSB_TO_AGBNO(ip->i_mount, irec->br_startblock);
        aglen = irec->br_blockcount;
 
-       error = xfs_reflink_find_shared(ip->i_mount, agno, agbno,
+       error = xfs_reflink_find_shared(ip->i_mount, NULL, agno, agbno,
                        aglen, &fbno, &flen, true);
        if (error)
                return error;
@@ -1373,8 +1374,8 @@ xfs_reflink_dirty_extents(
                        agbno = XFS_FSB_TO_AGBNO(mp, map[1].br_startblock);
                        aglen = map[1].br_blockcount;
 
-                       error = xfs_reflink_find_shared(mp, agno, agbno, aglen,
-                                       &rbno, &rlen, true);
+                       error = xfs_reflink_find_shared(mp, NULL, agno, agbno,
+                                       aglen, &rbno, &rlen, true);
                        if (error)
                                goto out;
                        if (rbno == NULLAGBLOCK)
@@ -1445,7 +1446,7 @@ xfs_reflink_clear_inode_flag(
                agbno = XFS_FSB_TO_AGBNO(mp, map.br_startblock);
                aglen = map.br_blockcount;
 
-               error = xfs_reflink_find_shared(mp, agno, agbno, aglen,
+               error = xfs_reflink_find_shared(mp, *tpp, agno, agbno, aglen,
                                &rbno, &rlen, false);
                if (error)
                        return error;

diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
index d29a7967f0290ecb8b4ca7c4d4077723262c8ba2..b8cc5c3e27244a998cee3bb27433c171a25c1faf 100644 (file)
--- a/fs/xfs/xfs_reflink.h
+++ b/fs/xfs/xfs_reflink.h
@@ -20,9 +20,9 @@
 #ifndef __XFS_REFLINK_H
 #define __XFS_REFLINK_H 1
 
-extern int xfs_reflink_find_shared(struct xfs_mount *mp, xfs_agnumber_t agno,
-               xfs_agblock_t agbno, xfs_extlen_t aglen, xfs_agblock_t *fbno,
-               xfs_extlen_t *flen, bool find_maximal);
+extern int xfs_reflink_find_shared(struct xfs_mount *mp, struct xfs_trans *tp,
+               xfs_agnumber_t agno, xfs_agblock_t agbno, xfs_extlen_t aglen,
+               xfs_agblock_t *fbno, xfs_extlen_t *flen, bool find_maximal);
 extern int xfs_reflink_trim_around_shared(struct xfs_inode *ip,
                struct xfs_bmbt_irec *irec, bool *shared, bool *trimmed);