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

Commit 8d45b911 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: don't fill readdir cache for LSSNAP reply 



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

fs/ceph/inode.c

+11 −8
Original line number Diff line number Diff line
@@ -1516,16 +1516,19 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, 
		     rinfo->dir_nr, parent);

		if (rinfo->dir_dir)

			ceph_fill_dirfrag(d_inode(parent), rinfo->dir_dir);

	}



	if (ceph_frag_is_leftmost(frag) && req->r_readdir_offset == 2 &&

		if (ceph_frag_is_leftmost(frag) &&

		    req->r_readdir_offset == 2 &&

		    !(rinfo->hash_order && last_hash)) {

		/* note dir version at start of readdir so we can tell

		 * if any dentries get dropped */

		req->r_dir_release_cnt = atomic64_read(&ci->i_release_count);

		req->r_dir_ordered_cnt = atomic64_read(&ci->i_ordered_count);

			/* note dir version at start of readdir so we can

			 * tell if any dentries get dropped */

			req->r_dir_release_cnt =

				atomic64_read(&ci->i_release_count);

			req->r_dir_ordered_cnt =

				atomic64_read(&ci->i_ordered_count);

			req->r_readdir_cache_idx = 0;

		}

	}



	cache_ctl.index = req->r_readdir_cache_idx;

	fpos_offset = req->r_readdir_offset;