Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751685AbdF1VsA (ORCPT ); Wed, 28 Jun 2017 17:48:00 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:36404 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751618AbdF1Vrz (ORCPT ); Wed, 28 Jun 2017 17:47:55 -0400 From: Tahsin Erdogan To: Andreas Dilger , "Darrick J . Wong" , Jan Kara , "Theodore Ts'o" , linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Tahsin Erdogan Subject: [PATCH] ext4: fix __ext4_xattr_set_credits() Date: Wed, 28 Jun 2017 14:47:50 -0700 Message-Id: <20170628214750.31548-1-tahsin@google.com> X-Mailer: git-send-email 2.13.2.725.g09c95d1e9-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1302 Lines: 38 __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 --- 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