From 23b758e1e02b372bf3c7e5a8e40584fdacf07b62 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 10 Mar 2010 12:03:32 -0800
Subject: [PATCH] --- yaml --- r: 189215 b: refs/heads/master c:
 393f66209669ad23f4f6d4191234c1df4367df3c h: refs/heads/master i:   189213:
 4e013468105bd024d1f986eebaf85bc3ff406e00   189211:
 e5efe532410267b88f0934d1fb9dac568b89981e   189207:
 128de613e7530519987032e052aecb7914f0f890   189199:
 f5fbcc30b84f440e3671b336fa1b8d26a91f6bd8   189183:
 5b24364acc04b434a633a213b34248d2b1153990 v: v3

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

diff --git a/[refs] b/[refs]
index f45d3691adb9..c770847e1194 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d96d60498ff748c5a88c72ec5d1cc4ba9a583e7e
+refs/heads/master: 393f66209669ad23f4f6d4191234c1df4367df3c
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 5107384ee029..8a9116e15b70 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -288,8 +288,10 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
 			CEPH_MDS_OP_LSSNAP : CEPH_MDS_OP_READDIR;
 
 		/* discard old result, if any */
-		if (fi->last_readdir)
+		if (fi->last_readdir) {
 			ceph_mdsc_put_request(fi->last_readdir);
+			fi->last_readdir = NULL;
+		}
 
 		/* requery frag tree, as the frag topology may have changed */
 		frag = ceph_choose_frag(ceph_inode(inode), frag, NULL, NULL);