From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 5/6] xfs: add a flags argument to xfs_icache_free_cowblocks
Date: Mon, 18 May 2020 19:04:36 +0200 [thread overview]
Message-ID: <20200518170437.1218883-6-hch@lst.de> (raw)
In-Reply-To: <20200518170437.1218883-1-hch@lst.de>
Pass the SYNC_* flags directly instead of hiding the information in the
eofblocks structure.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_file.c | 2 +-
fs/xfs/xfs_icache.c | 11 ++++-------
fs/xfs/xfs_icache.h | 3 ++-
fs/xfs/xfs_super.c | 2 +-
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index a1a62647f3935..6fc1a4a2f1966 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -663,7 +663,7 @@ xfs_file_buffered_aio_write(
xfs_iunlock(ip, iolock);
eofb.eof_flags = XFS_EOF_FLAGS_SYNC;
xfs_icache_free_eofblocks(ip->i_mount, &eofb);
- xfs_icache_free_cowblocks(ip->i_mount, &eofb);
+ xfs_icache_free_cowblocks(ip->i_mount, &eofb, SYNC_WAIT);
goto write_retry;
}
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index aa664be49fd50..43273b809fa34 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -944,7 +944,7 @@ xfs_cowblocks_worker(
if (!sb_start_write_trylock(mp->m_super))
return;
- xfs_icache_free_cowblocks(mp, NULL);
+ xfs_icache_free_cowblocks(mp, NULL, SYNC_TRYLOCK);
sb_end_write(mp->m_super);
xfs_queue_cowblocks(mp);
@@ -1557,7 +1557,7 @@ xfs_inode_free_quota_blocks(
if (scan) {
xfs_icache_free_eofblocks(ip->i_mount, &eofb);
- xfs_icache_free_cowblocks(ip->i_mount, &eofb);
+ xfs_icache_free_cowblocks(ip->i_mount, &eofb, SYNC_WAIT);
}
return scan;
@@ -1767,12 +1767,9 @@ xfs_inode_free_cowblocks(
int
xfs_icache_free_cowblocks(
struct xfs_mount *mp,
- struct xfs_eofblocks *eofb)
+ struct xfs_eofblocks *eofb,
+ int flags)
{
- int flags = SYNC_TRYLOCK;
-
- if (eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC))
- flags = SYNC_WAIT;
return xfs_inode_ag_iterator_tag(mp, xfs_inode_free_cowblocks, flags,
eofb, XFS_ICI_COWBLOCKS_TAG);
}
diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
index 3e4a8b3913f51..a850142769226 100644
--- a/fs/xfs/xfs_icache.h
+++ b/fs/xfs/xfs_icache.h
@@ -66,7 +66,8 @@ 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 *);
+int xfs_icache_free_cowblocks(struct xfs_mount *mp, struct xfs_eofblocks *eofb,
+ int flags);
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 aae469f73efeb..67efcc5c87929 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1670,7 +1670,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_icache_free_cowblocks(mp, NULL, SYNC_TRYLOCK);
if (error) {
xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
return error;
--
2.26.2
next prev parent reply other threads:[~2020-05-18 17:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 17:04 inode iterator cleanups Christoph Hellwig
2020-05-18 17:04 ` [PATCH 1/6] xfs: remove xfs_inode_ag_iterator Christoph Hellwig
2020-05-18 17:04 ` [PATCH 2/6] xfs: mark xfs_inode_ag_iterator_tag static Christoph Hellwig
2020-05-18 17:04 ` [PATCH 3/6] xfs: remove __xfs_icache_free_eofblocks Christoph Hellwig
2020-05-18 17:04 ` [PATCH 4/6] xfs: merge xfs_inode_free_quota_{eof,cow}blocks Christoph Hellwig
2020-05-18 17:04 ` Christoph Hellwig [this message]
2020-05-18 17:04 ` [PATCH 6/6] xfs: add a flags argument to xfs_icache_free_eofblocks Christoph Hellwig
2020-05-19 1:23 ` inode iterator cleanups Darrick J. Wong
2020-05-19 6:40 ` Christoph Hellwig
2020-05-20 1:45 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200518170437.1218883-6-hch@lst.de \
--to=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox