Merge branch 'for-2.6.39' into for-2.6.40

diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
index 0c6d8167013749dce9028af641315dac7c3e4fa2..7c831a2731fa1210cf7b909113e12cfffc472c25 100644 (file)
--- 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..