From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: viro@zeniv.linux.org.uk, bart.vanassche@wdc.com,
ming.lei@redhat.com, tytso@mit.edu, darrick.wong@oracle.com,
jikos@kernel.org, rjw@rjwysocki.net, pavel@ucw.cz,
len.brown@intel.com, linux-fsdevel@vger.kernel.org
Cc: boris.ostrovsky@oracle.com, jgross@suse.com,
todd.e.brandt@linux.intel.com, nborisov@suse.com, jack@suse.cz,
martin.petersen@oracle.com, ONeukum@suse.com,
oleksandr@natalenko.name, oleg.b.antonyan@gmail.com,
linux-pm@vger.kernel.org, linux-block@vger.kernel.org,
linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org,
"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [RFC 3/5] xfs: allow fs freeze on suspend/hibernation
Date: Tue, 3 Oct 2017 11:53:11 -0700 [thread overview]
Message-ID: <20171003185313.1017-4-mcgrof@kernel.org> (raw)
In-Reply-To: <20171003185313.1017-1-mcgrof@kernel.org>
This also removes the freezer calls on the XFS kthread as they are
no longer needed.
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
fs/xfs/xfs_super.c | 3 ++-
fs/xfs/xfs_trans_ail.c | 7 ++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 64013b2db8e0..75c3415657eb 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1775,7 +1775,8 @@ static struct file_system_type xfs_fs_type = {
.name = "xfs",
.mount = xfs_fs_mount,
.kill_sb = kill_block_super,
- .fs_flags = FS_REQUIRES_DEV,
+ .fs_flags = FS_REQUIRES_DEV |
+ FS_FREEZE_ON_SUSPEND,
};
MODULE_ALIAS_FS("xfs");
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
index 354368a906e5..8cebda88e91a 100644
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
@@ -512,7 +512,6 @@ xfsaild(
long tout = 0; /* milliseconds */
current->flags |= PF_MEMALLOC;
- set_freezable();
while (!kthread_should_stop()) {
if (tout && tout <= 20)
@@ -535,19 +534,17 @@ xfsaild(
if (!xfs_ail_min(ailp) &&
ailp->xa_target == ailp->xa_target_prev) {
spin_unlock(&ailp->xa_lock);
- freezable_schedule();
+ schedule();
tout = 0;
continue;
}
spin_unlock(&ailp->xa_lock);
if (tout)
- freezable_schedule_timeout(msecs_to_jiffies(tout));
+ schedule_timeout(msecs_to_jiffies(tout));
__set_current_state(TASK_RUNNING);
- try_to_freeze();
-
tout = xfsaild_push(ailp);
}
--
2.14.0
next prev parent reply other threads:[~2017-10-03 18:53 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 18:53 [RFC 0/5] fs: replace kthread freezing with filesystem freeze/thaw Luis R. Rodriguez
2017-10-03 18:53 ` [RFC 1/5] fs: add iterate_supers_reverse() Luis R. Rodriguez
2017-10-03 18:53 ` [RFC 2/5] fs: freeze on suspend and thaw on resume Luis R. Rodriguez
2017-10-03 20:02 ` Bart Van Assche
2017-10-03 20:23 ` Luis R. Rodriguez
2017-10-03 20:32 ` Bart Van Assche
2017-10-03 20:39 ` Luis R. Rodriguez
2017-10-03 20:06 ` Jiri Kosina
2017-10-03 20:58 ` Dave Chinner
2017-10-03 21:16 ` Luis R. Rodriguez
2017-10-03 18:53 ` Luis R. Rodriguez [this message]
2017-10-03 18:53 ` [RFC 4/5] ext4: add fs freezing support on suspend/hibernation Luis R. Rodriguez
2017-10-03 19:59 ` Theodore Ts'o
2017-10-03 20:13 ` Luis R. Rodriguez
2017-10-04 1:42 ` Theodore Ts'o
2017-10-04 7:05 ` Dave Chinner
2017-10-04 15:25 ` Bart Van Assche
2017-10-04 16:48 ` Theodore Ts'o
2017-10-04 22:22 ` Dave Chinner
2017-10-03 18:53 ` [RFC 5/5] pm: remove kernel thread freezing Luis R. Rodriguez
2017-10-03 18:59 ` Rafael J. Wysocki
2017-10-03 21:15 ` Rafael J. Wysocki
2017-10-04 0:47 ` Luis R. Rodriguez
2017-10-04 1:03 ` Bart Van Assche
2017-11-29 23:05 ` Luis R. Rodriguez
2017-10-04 7:18 ` Dave Chinner
2017-10-03 20:12 ` Pavel Machek
2017-10-03 20:15 ` Jiri Kosina
2017-10-03 20:21 ` Pavel Machek
2017-10-03 20:38 ` Jiri Kosina
2017-10-03 20:41 ` Rafael J. Wysocki
2017-10-03 20:57 ` Pavel Machek
2017-10-03 21:00 ` Jiri Kosina
2017-10-03 21:09 ` Shuah Khan
2017-10-03 21:18 ` Luis R. Rodriguez
2017-10-03 20:49 ` Luis R. Rodriguez
2017-10-06 12:07 ` Pavel Machek
2017-10-06 12:54 ` Theodore Ts'o
2017-10-03 20:13 ` Bart Van Assche
2017-10-03 20:17 ` Jiri Kosina
2017-10-03 20:21 ` Bart Van Assche
2017-10-03 20:24 ` Jiri Kosina
2017-10-03 20:27 ` Luis R. Rodriguez
2017-10-03 20:51 ` Jiri Kosina
2017-10-03 21:04 ` Dave Chinner
2017-10-03 21:07 ` Luis R. Rodriguez
2017-10-04 6:07 ` Hannes Reinecke
2017-10-03 19:33 ` [RFC 0/5] fs: replace kthread freezing with filesystem freeze/thaw Ming Lei
2017-10-03 20:05 ` Luis R. Rodriguez
2017-10-03 20:47 ` Matthew Wilcox
2017-10-03 20:54 ` Luis R. Rodriguez
2017-10-03 20:59 ` Bart Van Assche
2017-10-04 15:43 ` Ming Lei
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=20171003185313.1017-4-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=ONeukum@suse.com \
--cc=bart.vanassche@wdc.com \
--cc=boris.ostrovsky@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=jack@suse.cz \
--cc=jgross@suse.com \
--cc=jikos@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=nborisov@suse.com \
--cc=oleg.b.antonyan@gmail.com \
--cc=oleksandr@natalenko.name \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=todd.e.brandt@linux.intel.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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).