From 112d3b10408f3903168e4e20e4eff3bcbdd4b02f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 11 Nov 2009 15:21:27 -0800
Subject: [PATCH] --- yaml --- r: 188615 b: refs/heads/master c:
 09b8a7d2af83ae96dc052f9708e50140d06a9b6c h: refs/heads/master i:   188613:
 ddb20262f6b3144e9899ac7e462d36cbe148cf1a   188611:
 d1e9af5ff0c1802fc997efe63a3570416efa541a   188607:
 f6bc4d0f1cca8c037b2769c18403b627b7d146cb v: v3

---
 [refs]              | 2 +-
 trunk/fs/ceph/dir.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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,