diff --git a/[refs] b/[refs] index 3d7586c2c070..0e905c1dfe8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdac830313fa6bf2831693af80fefe4aaac11b7d +refs/heads/master: 09b8a7d2af83ae96dc052f9708e50140d06a9b6c diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c index 4f7467961b09..32ef54367224 100644 --- a/trunk/fs/ceph/dir.c +++ b/trunk/fs/ceph/dir.c @@ -131,6 +131,7 @@ static int __dcache_readdir(struct file *filp, goto out_unlock; } if (!d_unhashed(dentry) && dentry->d_inode && + ceph_snap(dentry->d_inode) != CEPH_SNAPDIR && filp->f_pos <= di->offset) break; dout(" skipping %p %.*s at %llu (%llu)%s%s\n", dentry,