From: "Yan, Zheng" <zyan@redhat.com>

Date: Thu, 23 Nov 2017 17:47:15 +0800

Subject: ceph: voluntarily drop Ax cap for requests that create new inode

Git-commit: 222b7f90ba3825728fd27e9105aeee7af9576819

Patch-mainline: v4.16-rc1

References: FATE#324714

MDS need to rdlock directory inode's authlock when handling these

requests. Voluntarily dropping CEPH_CAP_AUTH_EXCL avoids a cap revoke

message.

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

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

Acked-by: Luis Henriques <lhenriques@suse.com>

---

 fs/ceph/caps.c |   21 +++++++++++++++------

 fs/ceph/dir.c  |    6 +++---

 fs/ceph/file.c |    2 +-

 3 files changed, 19 insertions(+), 10 deletions(-)

--- a/fs/ceph/caps.c

+++ b/fs/ceph/caps.c

@@ -3938,11 +3938,20 @@ int ceph_encode_inode_release(void **p,

 	cap = __get_cap_for_mds(ci, mds);

 	if (cap && __cap_is_valid(cap)) {

-		if (force ||

-		    ((cap->issued & drop) &&

-		     (cap->issued & unless) == 0)) {

-			if ((cap->issued & drop) &&

-			    (cap->issued & unless) == 0) {

+		unless &= cap->issued;

+		if (unless) {

+			if (unless & CEPH_CAP_AUTH_EXCL)

+				drop &= ~CEPH_CAP_AUTH_SHARED;

+			if (unless & CEPH_CAP_LINK_EXCL)

+				drop &= ~CEPH_CAP_LINK_SHARED;

+			if (unless & CEPH_CAP_XATTR_EXCL)

+				drop &= ~CEPH_CAP_XATTR_SHARED;

+			if (unless & CEPH_CAP_FILE_EXCL)

+				drop &= ~CEPH_CAP_FILE_SHARED;

+		}

+

+		if (force || (cap->issued & drop)) {

+			if (cap->issued & drop) {

 				int wanted = __ceph_caps_wanted(ci);

 				if ((ci->i_ceph_flags & CEPH_I_NODELAY) == 0)

 					wanted |= cap->mds_wanted;

@@ -3974,7 +3983,7 @@ int ceph_encode_inode_release(void **p,

 			*p += sizeof(*rel);

 			ret = 1;

 		} else {

-			dout("encode_inode_release %p cap %p %s\n",

+			dout("encode_inode_release %p cap %p %s (noop)\n",

 			     inode, cap, ceph_cap_string(cap->issued));

 		}

 	}

--- a/fs/ceph/dir.c

+++ b/fs/ceph/dir.c

@@ -834,7 +834,7 @@ static int ceph_mknod(struct inode *dir,

 	set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);

 	req->r_args.mknod.mode = cpu_to_le32(mode);

 	req->r_args.mknod.rdev = cpu_to_le32(rdev);

-	req->r_dentry_drop = CEPH_CAP_FILE_SHARED;

+	req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL;

 	req->r_dentry_unless = CEPH_CAP_FILE_EXCL;

 	if (acls.pagelist) {

 		req->r_pagelist = acls.pagelist;

@@ -886,7 +886,7 @@ static int ceph_symlink(struct inode *di

 	set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);

 	req->r_dentry = dget(dentry);

 	req->r_num_caps = 2;

-	req->r_dentry_drop = CEPH_CAP_FILE_SHARED;

+	req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL;

 	req->r_dentry_unless = CEPH_CAP_FILE_EXCL;

 	err = ceph_mdsc_do_request(mdsc, dir, req);

 	if (!err && !req->r_reply_info.head->is_dentry)

@@ -935,7 +935,7 @@ static int ceph_mkdir(struct inode *dir,

 	req->r_parent = dir;

 	set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);

 	req->r_args.mkdir.mode = cpu_to_le32(mode);

-	req->r_dentry_drop = CEPH_CAP_FILE_SHARED;

+	req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL;

 	req->r_dentry_unless = CEPH_CAP_FILE_EXCL;

 	if (acls.pagelist) {

 		req->r_pagelist = acls.pagelist;

--- a/fs/ceph/file.c

+++ b/fs/ceph/file.c

@@ -395,7 +395,7 @@ int ceph_atomic_open(struct inode *dir,

 	req->r_dentry = dget(dentry);

 	req->r_num_caps = 2;

 	if (flags & O_CREAT) {

-		req->r_dentry_drop = CEPH_CAP_FILE_SHARED;

+		req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL;

 		req->r_dentry_unless = CEPH_CAP_FILE_EXCL;

 		if (acls.pagelist) {

 			req->r_pagelist = acls.pagelist;