diff --git a/[refs] b/[refs] index 3e2eef504db1..8b9c6607a597 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9660439861aa8dbd5e2b8087f33e20760c2c9afc +refs/heads/master: d6c558379abc27241c75b8c30fc8c94b82537d5e diff --git a/trunk/fs/nfsd/lockd.c b/trunk/fs/nfsd/lockd.c index 0c6d81670137..7c831a2731fa 100644 --- a/trunk/fs/nfsd/lockd.c +++ b/trunk/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..