diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-15 04:36:31 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-15 04:36:31 +0100 |
| commit | 0ed3f64ec3a7ad29e83e03607115eeffa32f553c (patch) | |
| tree | 528681b043e947cfc51527d56098f586b6dfa217 /fs/reiserfs/xattr_acl.c | |
| parent | [CIFS] SessionSetup cleanup part 2 (diff) | |
| parent | [PATCH] neofb: avoid resetting display config on unblank (diff) | |
| download | linux-0ed3f64ec3a7ad29e83e03607115eeffa32f553c.tar.xz linux-0ed3f64ec3a7ad29e83e03607115eeffa32f553c.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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) acl = ERR_PTR(retval); } else { acl = posix_acl_from_disk(value, retval); - *p_acl = posix_acl_dup(acl); + if (!IS_ERR(acl)) + *p_acl = posix_acl_dup(acl); } kfree(value); |