diff mbox

[1/1] NFSv4 always compare stateids in nfs4_stateid_is_current

Message ID 1393528430-5237-1-git-send-email-andros@netapp.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andy Adamson Feb. 27, 2014, 7:13 p.m. UTC 
From: Andy Adamson <andros@netapp.com>

When nfs4_stateid_is_current does not compare the from the wire
stateid to the current stateid, nfs4_read/write_stateid_changed
can return a false positive resulting in a READ or WRITE looping
forever retrying a bad stateid and never triggering a stateid
recovery.

Do not check the non-boolean return from nfs4_set_rw_stateid.

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/nfs4proc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8672323..11566a4 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4051,10 +4051,9 @@  static bool nfs4_stateid_is_current(nfs4_stateid *stateid,
 		const struct nfs_lock_context *l_ctx,
 		fmode_t fmode)
 {
-	nfs4_stateid current_stateid;
+	nfs4_stateid current_stateid = &zero_stateid;
 
-	if (nfs4_set_rw_stateid(&current_stateid, ctx, l_ctx, fmode))
-		return false;
+	nfs4_set_rw_stateid(&current_stateid, ctx, l_ctx, fmode);
 	return nfs4_stateid_match(stateid, &current_stateid);
 }