Merge branch 'for-2.6.39' into for-2.6.40

d6c55837 · J. Bruce Fields · 96604398 · 954032d2 · d6c55837
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

fs/nfsd/lockd.c fs/nfsd/lockd.c +0 -1

未找到文件。
--- 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..