Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d37ca14 authored Jul 26, 2017 by Yan, Zheng Committed by Ilya Dryomov Sep 06, 2017

ceph: send LSSNAP request to auth mds of directory inode



Snapdir inode has no capability. __choose_mds() should choose mds
base on capabilities of snapdir's parent inode.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 8d45b911

fs/ceph/dir.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -377,8 +377,10 @@ static int ceph_readdir(struct file file, struct dir_context ctx)
		}
		/* hints to request -> mds selection code */
		req->r_direct_mode = USE_AUTH_MDS;
		if (op == CEPH_MDS_OP_READDIR) {
		req->r_direct_hash = ceph_frag_value(frag);
		__set_bit(CEPH_MDS_R_DIRECT_IS_HASH, &req->r_req_flags);
		}
		if (fi->last_name) {
		req->r_path2 = kstrdup(fi->last_name, GFP_KERNEL);
		if (!req->r_path2) {

fs/ceph/mds_client.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -731,9 +731,16 @@ static int __choose_mds(struct ceph_mds_client *mdsc,

		inode = NULL;
		if (req->r_inode) {
		if (ceph_snap(req->r_inode) != CEPH_SNAPDIR) {
		inode = req->r_inode;
		ihold(inode);
		} else if (req->r_dentry) {
		} else {
		/* req->r_dentry is non-null for LSSNAP request.
		* fall-thru */
		WARN_ON_ONCE(!req->r_dentry);
		}
		}
		if (!inode && req->r_dentry) {
		/* ignore race with rename; old or new d_parent is okay */
		struct dentry *parent;
		struct inode *dir;