diff options
| author | Dave Kleikamp <shaggy@shaggy.austin.ibm.com> | 2003-05-27 22:23:35 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@shaggy.austin.ibm.com> | 2003-05-27 22:23:35 -0500 |
| commit | be7b33d2bff85ec9dafc5ec0dfbc8a9f482057e8 (patch) | |
| tree | 7956786d48bf0be6ef613794b57994dffe922928 | |
| parent | 015498d534572f8a9c3bf5f1dfc02bd02bfb2c9d (diff) | |
| parent | 1770711cb779992ef23d25ca4d59ae460de3c59b (diff) | |
Merge jfs@jfs.bkbits.net:linux-2.5
into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5
| -rw-r--r-- | Documentation/filesystems/jfs.txt | 4 | ||||
| -rw-r--r-- | fs/jfs/super.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/filesystems/jfs.txt b/Documentation/filesystems/jfs.txt index 83a85037f223..bdb8ccab7a84 100644 --- a/Documentation/filesystems/jfs.txt +++ b/Documentation/filesystems/jfs.txt @@ -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: 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); |