Commit 1770711c authored by Dave Kleikamp's avatar Dave Kleikamp

Merge jfs@jfs.bkbits.net:linux-2.5

into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5
parents 57bd7464 ea493f3c
......@@ -4,10 +4,10 @@ JFS Homepage: http://oss.software.ibm.com/jfs/
Team members
------------
Steve Best sbest@us.ibm.com
Dave Kleikamp shaggy@austin.ibm.com
Dave Blaschke blaschke@us.ibm.com
Steve Best sbest@us.ibm.com
Barry Arndt barndt@us.ibm.com
Christoph Hellwig hch@infradead.org
The following mount options are supported:
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment