Merge branch 'for-2.6.39' into for-2.6.40

This commit is contained in:
J. Bruce Fields 2011-04-07 15:19:21 -04:00
commit d6c558379a
1 changed files with 0 additions and 1 deletions

View File

@ -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..