Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed Jul 27, 2009
2 parents 9ae2602 + 4a19fb1 commit a9355cf
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions fs/jfs/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit a9355cf

Please sign in to comment.