diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
| commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
| tree | 470cce472be3b08c160e0c569648e7228651b12a /fs/reiserfs/xattr_acl.c | |
| parent | ebcff3c773b42bce6182ec16485abca4e53fba97 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/reiserfs/xattr_acl.c')
| -rw-r--r-- | fs/reiserfs/xattr_acl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 43de3ba83332..ab8894c3b9e5 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c | |||
| @@ -228,7 +228,8 @@ struct posix_acl *reiserfs_get_acl(struct inode *inode, int type) | |||
| 228 | acl = ERR_PTR(retval); | 228 | acl = ERR_PTR(retval); |
| 229 | } else { | 229 | } else { |
| 230 | acl = posix_acl_from_disk(value, retval); | 230 | acl = posix_acl_from_disk(value, retval); |
| 231 | *p_acl = posix_acl_dup(acl); | 231 | if (!IS_ERR(acl)) |
| 232 | *p_acl = posix_acl_dup(acl); | ||
| 232 | } | 233 | } |
| 233 | 234 | ||
| 234 | kfree(value); | 235 | kfree(value); |