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

Commit 15b51bd6 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: stop on-going cached readdir if mds revokes FILE_SHARED cap 



If directory's FILE_SHARED cap get revoked, dentry in the directory
can get spliced into other directory (Eg, other client move the
dentry into directory B, then we do readdir on directory B). So we
should stop on-going cached readdir. this can be achieved by marking
dir not complete, because __dcache_readdir() checks dir completeness
before emitting each dentry.

Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent f275635e

fs/ceph/caps.c

+7 −6
Original line number Diff line number Diff line
@@ -490,12 +490,13 @@ static void __check_cap_issue(struct ceph_inode_info *ci, struct ceph_cap *cap, 
	}



	/*

	 * if we are newly issued FILE_SHARED, mark dir not complete; we

	 * don't know what happened to this directory while we didn't

	 * have the cap.

	 * If FILE_SHARED is newly issued, mark dir not complete. We don't

	 * know what happened to this directory while we didn't have the cap.

	 * If FILE_SHARED is being revoked, also mark dir not complete. It

	 * stops on-going cached readdir.

	 */

	if ((issued & CEPH_CAP_FILE_SHARED) &&

	    (had & CEPH_CAP_FILE_SHARED) == 0) {

	if ((issued & CEPH_CAP_FILE_SHARED) != (had & CEPH_CAP_FILE_SHARED)) {

		if (issued & CEPH_CAP_FILE_SHARED)

			ci->i_shared_gen++;

		if (S_ISDIR(ci->vfs_inode.i_mode)) {

			dout(" marking %p NOT complete\n", &ci->vfs_inode);