Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-2
+2
-2
fs/ceph/addr.c
+2
-2
fs/ceph/addr.c
···
502
502
dout(" head snapc %p has %d dirty pages\n",
503
503
snapc, ci->i_wrbuffer_ref_head);
504
504
if (truncate_size)
505
-
*truncate_size = capsnap->truncate_size;
505
+
*truncate_size = ci->i_truncate_size;
506
506
if (truncate_seq)
507
-
*truncate_seq = capsnap->truncate_seq;
507
+
*truncate_seq = ci->i_truncate_seq;
508
508
}
509
509
spin_unlock(&ci->i_ceph_lock);
510
510
return snapc;
+5
fs/ceph/mds_client.c
+5
fs/ceph/mds_client.c
···
2106
2106
dout("do_request mdsmap err %d\n", err);
2107
2107
goto finish;
2108
2108
}
2109
+
if (mdsc->mdsmap->m_epoch == 0) {
2110
+
dout("do_request no mdsmap, waiting for map\n");
2111
+
list_add(&req->r_wait, &mdsc->waiting_for_map);
2112
+
goto finish;
2113
+
}
2109
2114
if (!(mdsc->fsc->mount_options->flags &
2110
2115
CEPH_MOUNT_OPT_MOUNTWAIT) &&
2111
2116
!ceph_mdsmap_is_cluster_available(mdsc->mdsmap)) {