On Jun 28, 2017, at 3:47 PM, Tahsin Erdogan <tahsin@xxxxxxxxxx> wrote:
>
> __ext4_xattr_set_credits() calculates journal credits needed for a
> set xattr operation. Currently, credits needed for quota updates are
> added only if ea_inode feature is enabled which is wrong. Fix this by
> moving quota related additions to above ea_inode feature check.
>
> Fixes: 74c5bfa651af ("ext4: xattr inode deduplication")
>
> Signed-off-by: Tahsin Erdogan <tahsin@xxxxxxxxxx>
Reviewed-by: Andreas Dilger <adilger@xxxxxxxxx>
> ---
> fs/ext4/xattr.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
> index ce12c3fb7e59..062756b4e6d8 100644
> --- a/fs/ext4/xattr.c
> +++ b/fs/ext4/xattr.c
> @@ -845,6 +845,9 @@ static int __ext4_xattr_set_credits(struct super_block *sb,
> */
> credits = 5;
>
> + /* Quota updates. */
> + credits += EXT4_MAXQUOTAS_TRANS_BLOCKS(sb);
> +
> /* We are done if ea_inode feature is not enabled. */
> if (!ext4_has_feature_ea_inode(sb))
> return credits;
> @@ -878,9 +881,6 @@ static int __ext4_xattr_set_credits(struct super_block *sb,
> /* Block bitmap and group descriptor updates for each block. */
> credits += blocks * 2;
>
> - /* Quota updates. */
> - credits += EXT4_MAXQUOTAS_TRANS_BLOCKS(sb);
> -
> /* We may need to clone the existing xattr block in which case we need
> * to increment ref counts for existing ea_inodes referenced by it.
> */
> --
> 2.13.2.725.g09c95d1e9-goog
>
Cheers, Andreas
Attachment:
signature.asc
Description: Message signed with OpenPGP
