diff --git a/[refs] b/[refs]
index 03e1e05670f2..652002aec231 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e00de341fdb76c955703b4438100f9933c452b7f
+refs/heads/master: 455cec0abff563574cca432ced49f734117ca113
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 196fd4c62db7..099a58615b90 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -496,6 +496,7 @@ struct dentry *ceph_finish_lookup(struct ceph_mds_request *req,
 
 	/* .snap dir? */
 	if (err == -ENOENT &&
+	    ceph_snap(parent) == CEPH_NOSNAP &&
 	    strcmp(dentry->d_name.name,
 		   fsc->mount_options->snapdir_name) == 0) {
 		struct inode *inode = ceph_get_snapdir(parent);