summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 12:15:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 12:15:56 -0700
commita9355cf8e68baac964f815079b820d2680756300 (patch)
tree2b12b884520ea72e51dceeff4e474f0593c73754 /fs
parent9ae260270c90643156cda73427aa1f04c923e627 (diff)
parent4a19fb11a90fdbbcb3bc02effa036230d035ca28 (diff)
downloadlinux-a9355cf8e68baac964f815079b820d2680756300.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: Fix early release of acl in jfs_get_acl
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/acl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 91fa3ad6e8c2..a29c7c3e3fb8 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -67,10 +67,8 @@ static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
acl = posix_acl_from_xattr(value, size);
}
kfree(value);
- if (!IS_ERR(acl)) {
+ if (!IS_ERR(acl))
set_cached_acl(inode, type, acl);
- posix_acl_release(acl);
- }
return acl;
}