aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-06-27 16:57:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:40 -0700
commitecf6c7480f0c9aef2a39e8cb881ebd98bfcb8caa (patch)
tree7b720302df6f61033df24a1b5c1d42c25135b181 /fs
parentf6d7de0ee45c2408056bb2a9e2b21ba86fbfd833 (diff)
downloadkernel_samsung_tuna-ecf6c7480f0c9aef2a39e8cb881ebd98bfcb8caa.zip
kernel_samsung_tuna-ecf6c7480f0c9aef2a39e8cb881ebd98bfcb8caa.tar.gz
kernel_samsung_tuna-ecf6c7480f0c9aef2a39e8cb881ebd98bfcb8caa.tar.bz2
nfsd4: remember to put RW access on stateid destruction
commit 499f3edc23ca0431f3a0a6736b3a40944c81bf3b upstream. Without this, for example, open read open read+write close will result in a struct file leak. Regression from 7d94784293096c0a46897acdb83be5abd9278ece "nfsd4: fix downgrade/lock logic". Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index bdf81bf..2a2b3f5 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -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);