shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 01:36:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

nfsd4: remember to put RW access on stateid destruction

Browse Source 
commit 499f3edc23 upstream.

Without this, for example,

	open read
	open read+write
	close

will result in a struct file leak.

Regression from 7d94784293 "nfsd4: fix
downgrade/lock logic".

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
J. Bruce Fields
2011-06-27 16:57:12 -04:00
committed by Greg Kroah-Hartman
parent f6d7de0ee4
commit ecf6c7480f
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/nfsd/nfs4state.c
View File

@@ -381,14 +381,6 @@ static int nfs4_access_to_omode(u32 access)
BUG();
}
static int nfs4_access_bmap_to_omode(struct nfs4_stateid *stp)
{
unsigned int access;
set_access(&access, stp->st_access_bmap);
return nfs4_access_to_omode(access);
}
static void unhash_generic_stateid(struct nfs4_stateid *stp)
{
list_del(&stp->st_hash);
@@ -398,11 +390,14 @@ static void unhash_generic_stateid(struct nfs4_stateid *stp)
static void free_generic_stateid(struct nfs4_stateid *stp)
{
int oflag;
int i;
if (stp->st_access_bmap) {
oflag = nfs4_access_bmap_to_omode(stp);
nfs4_file_put_access(stp->st_file, oflag);
for (i = 1; i < 4; i++) {
if (test_bit(i, &stp->st_access_bmap))
nfs4_file_put_access(stp->st_file,
nfs4_access_to_omode(i));
}
}
put_nfs4_file(stp->st_file);
kmem_cache_free(stateid_slab, stp);