ceph: don't fill readdir cache for LSSNAP reply

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

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 2c5db368617328e89500f5153bc8f595916104ae..4c34e08e2d4f4bb2033c44864daaa1664c32f996 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1516,15 +1516,18 @@ 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 &&
-           !(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);
-               req->r_readdir_cache_idx = 0;
+               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);
+                       req->r_readdir_cache_idx = 0;
+               }
        }
 
        cache_ctl.index = req->r_readdir_cache_idx;