tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix oops on lock failure
nfsd: fix auth_domain reference leak on nlm operations

Linus Torvalds 18770c7c 6b98cd5a

+6 -4
-1
fs/nfsd/lockd.c
··· 38 38 exp_readlock(); 39 39 nfserr = nfsd_open(rqstp, &fh, S_IFREG, NFSD_MAY_LOCK, filp); 40 40 fh_put(&fh); 41 - rqstp->rq_client = NULL; 42 41 exp_readunlock(); 43 42 /* We return nlm error codes as nlm doesn't know 44 43 * about nfsd, but nfsd does know about nlm..
+6 -3
fs/nfsd/nfs4state.c
··· 397 397 398 398 static void free_generic_stateid(struct nfs4_stateid *stp) 399 399 { 400 - int oflag = nfs4_access_bmap_to_omode(stp); 400 + int oflag; 401 401 402 - nfs4_file_put_access(stp->st_file, oflag); 403 - put_nfs4_file(stp->st_file); 402 + if (stp->st_access_bmap) { 403 + oflag = nfs4_access_bmap_to_omode(stp); 404 + nfs4_file_put_access(stp->st_file, oflag); 405 + put_nfs4_file(stp->st_file); 406 + } 404 407 kmem_cache_free(stateid_slab, stp); 405 408 } 406 409