diff options
Diffstat (limited to 'fs/ext3/acl.c')
| -rw-r--r-- | fs/ext3/acl.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index c4509495a104..5507381681b8 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c @@ -194,13 +194,6 @@ __ext3_set_acl(handle_t *handle, struct inode *inode, int type, switch(type) { case ACL_TYPE_ACCESS: name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS; - if (acl) { - error = posix_acl_update_mode(inode, &inode->i_mode, &acl); - if (error) - return error; - inode->i_ctime = CURRENT_TIME_SEC; - ext3_mark_inode_dirty(handle, inode); - } break; case ACL_TYPE_DEFAULT: @@ -239,7 +232,15 @@ retry: handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS(inode->i_sb)); if (IS_ERR(handle)) return PTR_ERR(handle); + if (type == ACL_TYPE_ACCESS && acl) { + error = posix_acl_update_mode(inode, &inode->i_mode, &acl); + if (error) + goto journal_stop; + inode->i_ctime = CURRENT_TIME_SEC; + ext3_mark_inode_dirty(handle, inode); + } error = __ext3_set_acl(handle, inode, type, acl); +journal_stop: ext3_journal_stop(handle); if (error == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries)) goto retry; |