ext4: fix the number of credits needed for acl ops with inline data

[~andy/linux] / fs / ext4 / xattr.c

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 2efc5600b03bf7fbf51c56636c58ce78ad317a36..cc31da02759675501245c8a14e957834c94f8fd5 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1165,16 +1165,9 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name,
 {
        handle_t *handle;
        int error, retries = 0;
-       int credits = EXT4_DATA_TRANS_BLOCKS(inode->i_sb);
+       int credits = ext4_jbd2_credits_xattr(inode);
 
 retry:
-       /*
-        * In case of inline data, we may push out the data to a block,
-        * So reserve the journal space first.
-        */
-       if (ext4_has_inline_data(inode))
-               credits += ext4_writepage_trans_blocks(inode) + 1;
-
        handle = ext4_journal_start(inode, EXT4_HT_XATTR, credits);
        if (IS_ERR(handle)) {
                error = PTR_ERR(handle);