ceph: flush mdlog before umounting

[ Upstream commit d095559ce4100f0c02aea229705230deac329c97 ]

Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Stable-dep-of: 5bd76b8de5b7 ("ceph: fix NULL pointer dereference for req->r_session")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 45587b3025e4b09f03f3612fac8b35b6112519cb..fa51872ff850482b19d291984ef51079e2141ffd 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -4664,6 +4664,30 @@ static void wait_requests(struct ceph_mds_client *mdsc)
        dout("wait_requests done\n");
 }
 
+void send_flush_mdlog(struct ceph_mds_session *s)
+{
+       struct ceph_msg *msg;
+
+       /*
+        * Pre-luminous MDS crashes when it sees an unknown session request
+        */
+       if (!CEPH_HAVE_FEATURE(s->s_con.peer_features, SERVER_LUMINOUS))
+               return;
+
+       mutex_lock(&s->s_mutex);
+       dout("request mdlog flush to mds%d (%s)s seq %lld\n", s->s_mds,
+            ceph_session_state_name(s->s_state), s->s_seq);
+       msg = ceph_create_session_msg(CEPH_SESSION_REQUEST_FLUSH_MDLOG,
+                                     s->s_seq);
+       if (!msg) {
+               pr_err("failed to request mdlog flush to mds%d (%s) seq %lld\n",
+                      s->s_mds, ceph_session_state_name(s->s_state), s->s_seq);
+       } else {
+               ceph_con_send(&s->s_con, msg);
+       }
+       mutex_unlock(&s->s_mutex);
+}
+
 /*
  * called before mount is ro, and before dentries are torn down.
  * (hmm, does this still race with new lookups?)
@@ -4673,6 +4697,7 @@ void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc)
        dout("pre_umount\n");
        mdsc->stopping = 1;
 
+       ceph_mdsc_iterate_sessions(mdsc, send_flush_mdlog, true);
        ceph_mdsc_iterate_sessions(mdsc, lock_unlock_session, false);
        ceph_flush_dirty_caps(mdsc);
        wait_requests(mdsc);

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 88fc80832016981dfc21a71efdb5239e57834b7b..a92e42e8a9f82f6194f940c2342522acaba29e7b 100644 (file)
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -518,6 +518,7 @@ static inline void ceph_mdsc_put_request(struct ceph_mds_request *req)
        kref_put(&req->r_kref, ceph_mdsc_release_request);
 }
 
+extern void send_flush_mdlog(struct ceph_mds_session *s);
 extern void ceph_mdsc_iterate_sessions(struct ceph_mds_client *mdsc,
                                       void (*cb)(struct ceph_mds_session *),
                                       bool check_state);

diff --git a/fs/ceph/strings.c b/fs/ceph/strings.c
index 4a79f3632260e83a9f3169aea4c11da0119f8117..573bb9556fb56cbf16802d7770fcf22305bc5469 100644 (file)
--- a/fs/ceph/strings.c
+++ b/fs/ceph/strings.c
@@ -46,6 +46,7 @@ const char *ceph_session_op_name(int op)
        case CEPH_SESSION_FLUSHMSG_ACK: return "flushmsg_ack";
        case CEPH_SESSION_FORCE_RO: return "force_ro";
        case CEPH_SESSION_REJECT: return "reject";
+       case CEPH_SESSION_REQUEST_FLUSH_MDLOG: return "flush_mdlog";
        }
        return "???";
 }

diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index 455e9b9e2adf538d53ba1efcfccde2c96671f010..8287382d3d1dbe118c5454d0a2d00254232ad056 100644 (file)
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -288,6 +288,7 @@ enum {
        CEPH_SESSION_FLUSHMSG_ACK,
        CEPH_SESSION_FORCE_RO,
        CEPH_SESSION_REJECT,
+       CEPH_SESSION_REQUEST_FLUSH_MDLOG,
 };
 
 extern const char *ceph_session_op_name(int op);