From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 22 Jun 2005 17:16:28 +0000 (+0000)
Subject: [PATCH] NFSv4: fs/nfs/nfs4proc.c: small simplification
X-Git-Tag: v2.6.13-rc1~68^2~537^2~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ef19560f496fd3942e41e728950e5b5c9a461b;p=linux-2.6

[PATCH] NFSv4: fs/nfs/nfs4proc.c: small simplification

 The Coverity checker noticed that such a simplification was possible.

 Signed-off-by: Adrian Bunk <bunk@stusta.de>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 128d01cfea..7ff2370725 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -123,7 +123,7 @@ static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
 
 	BUG_ON(readdir->count < 80);
 	if (cookie > 2) {
-		readdir->cookie = (cookie > 2) ? cookie : 0;
+		readdir->cookie = cookie;
 		memcpy(&readdir->verifier, verifier, sizeof(readdir->verifier));
 		return;
 	}