aboutsummaryrefslogtreecommitdiff
path: root/fs/ceph/inode.c
diff options
context:
space:
mode:
authorGravatar Jeff Layton <jlayton@kernel.org> 2020-09-25 07:55:39 -0400
committerGravatar Ilya Dryomov <idryomov@gmail.com> 2020-12-14 23:21:46 +0100
commit50c9132ddfb2024e96900407beeec660cf9848bd (patch)
tree56e236b210e2fc21afda85ce2535239b7624b8e9 /fs/ceph/inode.c
parentceph: make fsc->mount_state an int (diff)
downloadlinux-50c9132ddfb2024e96900407beeec660cf9848bd.tar.gz
linux-50c9132ddfb2024e96900407beeec660cf9848bd.tar.bz2
linux-50c9132ddfb2024e96900407beeec660cf9848bd.zip
ceph: add new RECOVER mount_state when recovering session
When recovering a session (a'la recover_session=clean), we want to do all of the operations that we do on a forced umount, but changing the mount state to SHUTDOWN is can cause queued MDS requests to fail when the session comes back. Most of those can idle until the session is recovered in this situation. Reserve SHUTDOWN state for forced umount, and make a new RECOVER state for the forced reconnect situation. Change several tests for equality with SHUTDOWN to test for that or RECOVER. Signed-off-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: Xiubo Li <xiubli@redhat.com> Reviewed-by: "Yan, Zheng" <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph/inode.c')
-rw-r--r--fs/ceph/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 526faf4778ce..02b11a4a4d39 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1888,7 +1888,7 @@ static void ceph_do_invalidate_pages(struct inode *inode)
mutex_lock(&ci->i_truncate_mutex);
- if (READ_ONCE(fsc->mount_state) == CEPH_MOUNT_SHUTDOWN) {
+ if (READ_ONCE(fsc->mount_state) >= CEPH_MOUNT_SHUTDOWN) {
pr_warn_ratelimited("invalidate_pages %p %lld forced umount\n",
inode, ceph_ino(inode));
mapping_set_error(inode->i_mapping, -EIO);