aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-04-07 15:19:21 -0400
committerJ. Bruce Fields <bfields@redhat.com>2011-04-07 15:19:21 -0400
commitd6c558379abc27241c75b8c30fc8c94b82537d5e (patch)
treeed20d4042267c929897152856b007317840ff4f4
parent9660439861aa8dbd5e2b8087f33e20760c2c9afc (diff)
parent954032d2527f2fce7355ba70709b5e143d6b686f (diff)
Merge branch 'for-2.6.39' into for-2.6.40
-rw-r--r--fs/nfsd/lockd.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
index 0c6d81670137..7c831a2731fa 100644
--- 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..

Privacy Policy