From 3dfac55a4f69d09cb40f3519716954c8087df624 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 23 Dec 2008 16:04:13 -0500
Subject: [PATCH] --- yaml --- r: 124746 b: refs/heads/master c:
 027b6ca02192f381a5a91237ba8a8cf625dc6f6a h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/nfs4proc.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b5f7c098156..ffe42e1a5a08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dcd3926b214a1fb081df18305921dedae269977
+refs/heads/master: 027b6ca02192f381a5a91237ba8a8cf625dc6f6a
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index e8df52dc2bc5..49eebe25bbad 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -1104,8 +1104,9 @@ static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4
 
 	do {
 		err = _nfs4_open_expired(ctx, state);
-		if (err == -NFS4ERR_DELAY)
-			nfs4_handle_exception(server, err, &exception);
+		if (err != -NFS4ERR_DELAY)
+			break;
+		nfs4_handle_exception(server, err, &exception);
 	} while (exception.retry);
 	return err;
 }