From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 21/26] xfs: remove mode from xfs_reclaim_inodes()
Date: Wed, 9 Oct 2019 14:21:19 +1100 [thread overview]
Message-ID: <20191009032124.10541-22-david@fromorbit.com> (raw)
In-Reply-To: <20191009032124.10541-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Because it's always SYNC_WAIT now.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_icache.c | 7 +++----
fs/xfs/xfs_icache.h | 2 +-
fs/xfs/xfs_mount.c | 4 ++--
fs/xfs/xfs_super.c | 3 +--
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index ed996b37bda0..39c56200f1ce 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -1293,12 +1293,11 @@ xfs_reclaim_inodes_ag(
return freed;
}
-int
+void
xfs_reclaim_inodes(
- xfs_mount_t *mp,
- int mode)
+ struct xfs_mount *mp)
{
- return xfs_reclaim_inodes_ag(mp, mode, INT_MAX);
+ xfs_reclaim_inodes_ag(mp, SYNC_WAIT, INT_MAX);
}
/*
diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
index 4c0d8920cc54..1c9b9edb2986 100644
--- a/fs/xfs/xfs_icache.h
+++ b/fs/xfs/xfs_icache.h
@@ -49,7 +49,7 @@ int xfs_iget(struct xfs_mount *mp, struct xfs_trans *tp, xfs_ino_t ino,
struct xfs_inode * xfs_inode_alloc(struct xfs_mount *mp, xfs_ino_t ino);
void xfs_inode_free(struct xfs_inode *ip);
-int xfs_reclaim_inodes(struct xfs_mount *mp, int mode);
+void xfs_reclaim_inodes(struct xfs_mount *mp);
int xfs_reclaim_inodes_count(struct xfs_mount *mp);
long xfs_reclaim_inodes_nr(struct xfs_mount *mp, int nr_to_scan);
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index ecbc21af9100..3a38fe7c4f8d 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -988,7 +988,7 @@ xfs_mountfs(
* qm_unmount_quotas and therefore rely on qm_unmount to release the
* quota inodes.
*/
- xfs_reclaim_inodes(mp, SYNC_WAIT);
+ xfs_reclaim_inodes(mp);
xfs_health_unmount(mp);
out_log_dealloc:
mp->m_flags |= XFS_MOUNT_UNMOUNTING;
@@ -1070,7 +1070,7 @@ xfs_unmountfs(
* reclaim just to be sure. We can stop background inode reclaim
* here as well if it is still running.
*/
- xfs_reclaim_inodes(mp, SYNC_WAIT);
+ xfs_reclaim_inodes(mp);
xfs_health_unmount(mp);
xfs_qm_unmount(mp);
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 74767e6f48a7..d0619bf02a5d 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1180,8 +1180,7 @@ xfs_quiesce_attr(
xfs_log_force(mp, XFS_LOG_SYNC);
/* reclaim inodes to do any IO before the freeze completes */
- xfs_reclaim_inodes(mp, 0);
- xfs_reclaim_inodes(mp, SYNC_WAIT);
+ xfs_reclaim_inodes(mp);
/* Push the superblock and write an unmount record */
error = xfs_log_sbcount(mp);
--
2.23.0.rc1
next prev parent reply other threads:[~2019-10-09 3:21 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 3:20 [PATCH V2 00/26] mm, xfs: non-blocking inode reclaim Dave Chinner
2019-10-09 3:20 ` [PATCH 01/26] xfs: Lower CIL flush limit for large logs Dave Chinner
2019-10-11 12:39 ` Brian Foster
2019-10-30 17:08 ` Darrick J. Wong
2019-10-09 3:21 ` [PATCH 02/26] xfs: Throttle commits on delayed background CIL push Dave Chinner
2019-10-11 12:38 ` Brian Foster
2019-10-09 3:21 ` [PATCH 03/26] xfs: don't allow log IO to be throttled Dave Chinner
2019-10-11 9:35 ` Christoph Hellwig
2019-10-11 12:39 ` Brian Foster
2019-10-30 17:14 ` Darrick J. Wong
2019-10-09 3:21 ` [PATCH 04/26] xfs: Improve metadata buffer reclaim accountability Dave Chinner
2019-10-11 12:39 ` Brian Foster
2019-10-11 12:57 ` Christoph Hellwig
2019-10-11 23:14 ` Dave Chinner
2019-10-11 23:13 ` Dave Chinner
2019-10-12 12:05 ` Brian Foster
2019-10-13 3:14 ` Dave Chinner
2019-10-14 13:05 ` Brian Foster
2019-10-30 17:25 ` Darrick J. Wong
2019-10-30 21:43 ` Dave Chinner
2019-10-31 3:06 ` Darrick J. Wong
2019-10-31 20:50 ` Dave Chinner
2019-10-31 21:05 ` Darrick J. Wong
2019-10-31 21:22 ` Christoph Hellwig
2019-11-03 21:26 ` Dave Chinner
2019-11-04 23:08 ` Darrick J. Wong
2019-10-09 3:21 ` [PATCH 05/26] xfs: correctly acount for reclaimable slabs Dave Chinner
2019-10-11 12:39 ` Brian Foster
2019-10-30 17:16 ` Darrick J. Wong
2019-10-09 3:21 ` [PATCH 06/26] xfs: synchronous AIL pushing Dave Chinner
2019-10-11 9:42 ` Christoph Hellwig
2019-10-11 12:40 ` Brian Foster
2019-10-11 23:15 ` Dave Chinner
2019-10-09 3:21 ` [PATCH 07/26] xfs: tail updates only need to occur when LSN changes Dave Chinner
2019-10-11 9:50 ` Christoph Hellwig
2019-10-11 12:40 ` Brian Foster
2019-10-09 3:21 ` [PATCH 08/26] mm: directed shrinker work deferral Dave Chinner
2019-10-14 8:46 ` Christoph Hellwig
2019-10-14 13:06 ` Brian Foster
2019-10-18 7:59 ` Dave Chinner
2019-10-09 3:21 ` [PATCH 09/26] shrinkers: use defer_work for GFP_NOFS sensitive shrinkers Dave Chinner
2019-10-09 3:21 ` [PATCH 10/26] mm: factor shrinker work calculations Dave Chinner
2019-10-09 3:21 ` [PATCH 11/26] shrinker: defer work only to kswapd Dave Chinner
2019-10-09 3:21 ` [PATCH 12/26] shrinker: clean up variable types and tracepoints Dave Chinner
2019-10-09 3:21 ` [PATCH 13/26] mm: reclaim_state records pages reclaimed, not slabs Dave Chinner
2019-10-09 3:21 ` [PATCH 14/26] mm: back off direct reclaim on excessive shrinker deferral Dave Chinner
2019-10-11 16:21 ` Matthew Wilcox
2019-10-11 23:20 ` Dave Chinner
2019-10-09 3:21 ` [PATCH 15/26] mm: kswapd backoff for shrinkers Dave Chinner
2019-10-09 3:21 ` [PATCH 16/26] xfs: synchronous AIL pushing Dave Chinner
2019-10-11 10:18 ` Christoph Hellwig
2019-10-11 15:29 ` Brian Foster
2019-10-11 23:27 ` Dave Chinner
2019-10-12 12:08 ` Brian Foster
2019-10-09 3:21 ` [PATCH 17/26] xfs: don't block kswapd in inode reclaim Dave Chinner
2019-10-11 15:29 ` Brian Foster
2019-10-09 3:21 ` [PATCH 18/26] xfs: reduce kswapd blocking on inode locking Dave Chinner
2019-10-11 10:29 ` Christoph Hellwig
2019-10-09 3:21 ` [PATCH 19/26] xfs: kill background reclaim work Dave Chinner
2019-10-11 10:31 ` Christoph Hellwig
2019-10-09 3:21 ` [PATCH 20/26] xfs: use AIL pushing for inode reclaim IO Dave Chinner
2019-10-11 17:38 ` Brian Foster
2019-10-09 3:21 ` Dave Chinner [this message]
2019-10-11 10:39 ` [PATCH 21/26] xfs: remove mode from xfs_reclaim_inodes() Christoph Hellwig
2019-10-14 13:07 ` Brian Foster
2019-10-09 3:21 ` [PATCH 22/26] xfs: track reclaimable inodes using a LRU list Dave Chinner
2019-10-11 10:42 ` Christoph Hellwig
2019-10-14 13:07 ` Brian Foster
2019-10-09 3:21 ` [PATCH 23/26] xfs: reclaim inodes from the LRU Dave Chinner
2019-10-11 10:56 ` Christoph Hellwig
2019-10-30 23:25 ` Dave Chinner
2019-10-09 3:21 ` [PATCH 24/26] xfs: remove unusued old inode reclaim code Dave Chinner
2019-10-09 3:21 ` [PATCH 25/26] xfs: rework unreferenced inode lookups Dave Chinner
2019-10-11 12:55 ` Christoph Hellwig
2019-10-11 13:39 ` Peter Zijlstra
2019-10-11 23:38 ` Dave Chinner
2019-10-14 13:07 ` Brian Foster
2019-10-17 1:24 ` Dave Chinner
2019-10-17 7:57 ` Brian Foster
2019-10-18 20:29 ` Dave Chinner
2019-10-09 3:21 ` [PATCH 26/26] xfs: use xfs_ail_push_all_sync in xfs_reclaim_inodes Dave Chinner
2019-10-11 9:55 ` Christoph Hellwig
2019-10-09 7:06 ` [PATCH V2 00/26] mm, xfs: non-blocking inode reclaim Christoph Hellwig
2019-10-11 19:03 ` Josef Bacik
2019-10-11 23:48 ` Dave Chinner
2019-10-12 0:19 ` Josef Bacik
2019-10-12 0:48 ` Dave Chinner
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=20191009032124.10541-22-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--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;
as well as URLs for NNTP newsgroup(s).