xfs: hide xfs_icache_free_cowblocks

Change the one remaining caller of xfs_icache_free_cowblocks to use our
new combined blockgc scan function instead, since we will soon be
combining the two scans.  This introduces a slight behavior change,
since a readonly remount now clears out post-EOF preallocations and not
just CoW staging extents.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index d1a849053e6838ba3cd535fb8cce8c4d4c3e76da..45146e01697595e984a8745c6bcdc3530310e7f8 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -1567,7 +1567,7 @@ out_iolock:
        return ret;
 }
 
-int
+static int
 xfs_icache_free_cowblocks(
        struct xfs_mount        *mp,
        struct xfs_eofblocks    *eofb)

diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
index b8c2f23aa829399ed284a837cf5aff9f8ddc8215..de7604576e9eb004c31fa9e316e4e5480938557d 100644 (file)
--- a/fs/xfs/xfs_icache.h
+++ b/fs/xfs/xfs_icache.h
@@ -67,7 +67,6 @@ void xfs_queue_eofblocks(struct xfs_mount *);
 
 void xfs_inode_set_cowblocks_tag(struct xfs_inode *ip);
 void xfs_inode_clear_cowblocks_tag(struct xfs_inode *ip);
-int xfs_icache_free_cowblocks(struct xfs_mount *, struct xfs_eofblocks *);
 void xfs_cowblocks_worker(struct work_struct *);
 void xfs_queue_cowblocks(struct xfs_mount *);
 

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 8959561351cad9480301c6137c9a6dbe6d9bdef9..e8f71714d737da206fcd1b92049dfa8c6c3b2c1d 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1713,7 +1713,7 @@ xfs_remount_ro(
        xfs_stop_block_reaping(mp);
 
        /* Get rid of any leftover CoW reservations... */
-       error = xfs_icache_free_cowblocks(mp, NULL);
+       error = xfs_blockgc_free_space(mp, NULL);
        if (error) {
                xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
                return error;