Merge tag 'ceph-for-4.10-rc4' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
 "Two small fixups for the filesystem changes that went into this merge
  window"

* tag 'ceph-for-4.10-rc4' of git://github.com/ceph/ceph-client:
  ceph: fix get_oldest_context()
  ceph: fix mds cluster availability check

2 files changed, 7 insertions, 2 deletions

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 9cd0c0ea7cdb..e4b066cd912a 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -502,9 +502,9 @@ static struct ceph_snap_context *get_oldest_context(struct inode *inode,
                 dout(" head snapc %p has %d dirty pages\n",
                      snapc, ci->i_wrbuffer_ref_head);
                 if (truncate_size)
-                        *truncate_size = capsnap->truncate_size;
+                        *truncate_size = ci->i_truncate_size;
                 if (truncate_seq)
-                        *truncate_seq = capsnap->truncate_seq;
+                        *truncate_seq = ci->i_truncate_seq;
         }
         spin_unlock(&ci->i_ceph_lock);
         return snapc;
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 4f49253387a0..ec6b35e9f966 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2106,6 +2106,11 @@ static int __do_request(struct ceph_mds_client *mdsc,
                         dout("do_request mdsmap err %d\n", err);
                         goto finish;
                 }
+                if (mdsc->mdsmap->m_epoch == 0) {
+                        dout("do_request no mdsmap, waiting for map\n");
+                        list_add(&req->r_wait, &mdsc->waiting_for_map);
+                        goto finish;
+                }
                 if (!(mdsc->fsc->mount_options->flags &
                       CEPH_MOUNT_OPT_MOUNTWAIT) &&
                     !ceph_mdsmap_is_cluster_available(mdsc->mdsmap)) {