Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6c55837 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents 96604398 954032d2
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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..