diff options
| author | James Bottomley | 2006-06-10 20:47:26 +0200 |
|---|---|---|
| committer | James Bottomley | 2006-06-10 20:47:26 +0200 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /fs/reiserfs/xattr_acl.c | |
| parent | [SCSI] spi transport: don't allow dt to be set on SE or HVD buses (diff) | |
| parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | kernel-qcow2-linux-f0cd91a68acdc9b49d7f6738b514a426da627649.tar.gz kernel-qcow2-linux-f0cd91a68acdc9b49d7f6738b514a426da627649.tar.xz kernel-qcow2-linux-f0cd91a68acdc9b49d7f6738b514a426da627649.zip | |
Merge ../linux-2.6
Diffstat (limited to 'fs/reiserfs/xattr_acl.c')
| -rw-r--r-- | fs/reiserfs/xattr_acl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 58c418fbca2c..97ae1b92bc47 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c @@ -408,8 +408,9 @@ int reiserfs_cache_default_acl(struct inode *inode) acl = reiserfs_get_acl(inode, ACL_TYPE_DEFAULT); reiserfs_read_unlock_xattrs(inode->i_sb); reiserfs_read_unlock_xattr_i(inode); - ret = acl ? 1 : 0; - posix_acl_release(acl); + ret = (acl && !IS_ERR(acl)); + if (ret) + posix_acl_release(acl); } return ret; |