From 5819e4fff5d6ae1c1f897ae8fcad2e2700f4e3be Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 30 Mar 2010 09:41:25 +0000
Subject: [PATCH] --- yaml --- r: 189482 b: refs/heads/master c:
 85a770a8889035625466a4cfb1393cd7d2ffd165 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/9p/vfs_dir.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7efd3513e640..d387a9466239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11e9b49b7fa056bfc00a56de8956d1d5fe8b84ea
+refs/heads/master: 85a770a8889035625466a4cfb1393cd7d2ffd165
diff --git a/trunk/fs/9p/vfs_dir.c b/trunk/fs/9p/vfs_dir.c
index d8a3afe4ff72..bbe00cf799fa 100644
--- a/trunk/fs/9p/vfs_dir.c
+++ b/trunk/fs/9p/vfs_dir.c
@@ -130,6 +130,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
 	rdir = (struct p9_rdir *) fid->rdir;
 
 	err = mutex_lock_interruptible(&rdir->mutex);
+	if (err)
+		return err;
 	while (err == 0) {
 		if (rdir->tail == rdir->head) {
 			err = v9fs_file_readn(filp, rdir->buf, NULL,