From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Sun, 27 Jan 2008 04:36:48 +0000 (-0500)
Subject: nfsd4: kill unnecessary check in preprocess_stateid_op
X-Git-Tag: v2.6.26-rc1~1083^2~43
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a85fa3adddd3a74bd5b94c4b72668d307b88377;p=linux-2.6

nfsd4: kill unnecessary check in preprocess_stateid_op

This condition is always true.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b83b58da0c..a40d1ec52f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2052,7 +2052,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
 		renew_client(stp->st_stateowner->so_client);
 		if (filpp)
 			*filpp = stp->st_vfs_file;
-	} else if (dp) {
+	} else {
 		if ((status = nfs4_check_delegmode(dp, flags)))
 			goto out;
 		renew_client(dp->dl_client);