diff options
| author | Dave Kleikamp <shaggy@shaggy.austin.ibm.com> | 2003-05-26 21:46:25 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@shaggy.austin.ibm.com> | 2003-05-26 21:46:25 -0500 |
| commit | 1770711cb779992ef23d25ca4d59ae460de3c59b (patch) | |
| tree | 21debdd7d473ad8f84442a3a9173670ec31fb4eb /fs | |
| parent | 57bd7464bf6cf2a2936c1229052f01ab514ad4d9 (diff) | |
| parent | ea493f3c72dfea1c656378d3d31d2cbf71cc79fb (diff) | |
Merge jfs@jfs.bkbits.net:linux-2.5
into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jfs/super.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index ebb881e50ad2..ac23de624a05 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -105,10 +105,14 @@ static void jfs_destroy_inode(struct inode *inode) } #ifdef CONFIG_JFS_POSIX_ACL - if (ji->i_acl && (ji->i_acl != JFS_ACL_NOT_CACHED)) + if (ji->i_acl != JFS_ACL_NOT_CACHED) { posix_acl_release(ji->i_acl); - if (ji->i_default_acl && (ji->i_default_acl != JFS_ACL_NOT_CACHED)) + ji->i_acl = JFS_ACL_NOT_CACHED; + } + if (ji->i_default_acl != JFS_ACL_NOT_CACHED) { posix_acl_release(ji->i_default_acl); + ji->i_default_acl = JFS_ACL_NOT_CACHED; + } #endif kmem_cache_free(jfs_inode_cachep, ji); |