From 4c876597acc406056627f3c8794a68328f452e02 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 25 Aug 2005 16:25:35 -0700
Subject: [PATCH] --- yaml --- r: 9929 b: refs/heads/master c:
 9aa48b7e270d13c8781414dce081a42cae20a80d h: refs/heads/master i:   9927:
 6b4d24963ef83bd92af7a22acf53e0a88fad3148 v: v3

---
 [refs]             | 2 +-
 trunk/fs/nfs/dir.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6a43d88f9c2f..83e4cace9127 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 449231d6ddf50ca46b7fb2f76ecf790135222913
+refs/heads/master: 9aa48b7e270d13c8781414dce081a42cae20a80d
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 94a7fcee0624..c70eabd6d179 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -565,8 +565,6 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 		}
 	}
 	unlock_kernel();
-	if (desc->error < 0)
-		return desc->error;
 	if (res < 0)
 		return res;
 	return 0;