Merge branch 'for-2.6.39' into for-2.6.40

git-mirror · Apr 7, 2011 · d6c5583 · d6c5583
2 parents 9660439 + 954032d
commit d6c5583
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
@@ -38,7 +38,6 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp)
 	exp_readlock();
 	nfserr = nfsd_open(rqstp, &fh, S_IFREG, NFSD_MAY_LOCK, filp);
 	fh_put(&fh);
-	rqstp->rq_client = NULL;
 	exp_readunlock();
  	/* We return nlm error codes as nlm doesn't know
 	 * about nfsd, but nfsd does know about nlm..