---

yaml --- r: 188615 b: refs/heads/master c: 09b8a7d h: refs/heads/master i: 188613: ddb2026 188611: d1e9af5 188607: f6bc4d0 v: v3
git-mirror · Nov 11, 2009 · 112d3b1 · 112d3b1
1 parent 671ce85
commit 112d3b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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,