Commit 42ad631b authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: don't WARN if we're force umounting 



Force umount will try to close the sessions by setting the session
state to _CLOSING. We don't want to WARN in this situation, since it's
expected.

Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent a6d37ccd

fs/ceph/mds_client.c

+5 −2
Original line number Diff line number Diff line
@@ -4541,6 +4541,8 @@ static void maybe_recover_session(struct ceph_mds_client *mdsc) 


bool check_session_state(struct ceph_mds_session *s)

{

	struct ceph_fs_client *fsc = s->s_mdsc->fsc;



	switch (s->s_state) {

	case CEPH_MDS_SESSION_OPEN:

		if (s->s_ttl && time_after(jiffies, s->s_ttl)) {
@@ -4549,8 +4551,9 @@ bool check_session_state(struct ceph_mds_session *s) 
		}

		break;

	case CEPH_MDS_SESSION_CLOSING:

		/* Should never reach this when we're unmounting */

		WARN_ON_ONCE(s->s_ttl);

		/* Should never reach this when not force unmounting */

		WARN_ON_ONCE(s->s_ttl &&

			     READ_ONCE(fsc->mount_state) != CEPH_MOUNT_SHUTDOWN);

		fallthrough;

	case CEPH_MDS_SESSION_NEW:

	case CEPH_MDS_SESSION_RESTARTING: