From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADB7FC43215 for ; Fri, 22 Nov 2019 06:07:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71A572068F for ; Fri, 22 Nov 2019 06:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402827; bh=rbDfZ37pyFkTziq+H9O55VekzIqVmSm6qVNT7/Ygp88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZUZjxnRcKy5/dNYZJdeUtFtHK20kOY4wk3tGaCxgm8h7JGiDzbdxDt6Iy1NFDshBu +jL+SXiew2K3UImz3HZUgcK8jEHwAatGwgi5Tiy224PiY5fV0maXMK5GUNjN/DoAAQ nZCp1UyK1sEhhcepMpi+zDseZnh8vioKhlw4tD4c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729612AbfKVGCK (ORCPT ); Fri, 22 Nov 2019 01:02:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:40554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729579AbfKVGCF (ORCPT ); Fri, 22 Nov 2019 01:02:05 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A98782070B; Fri, 22 Nov 2019 06:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402525; bh=rbDfZ37pyFkTziq+H9O55VekzIqVmSm6qVNT7/Ygp88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dta8erRlPhaceZ2xiW/nDD/xWpOsC1qsFLbxMClcQMD3l6AioQETl6TdL/TXiqMPo XvpJk9Vt3dYLFr2dd5L8d8NWpvKpjqqL3Ekd/CNqB77P6TFZzXZKdh9Scm/YkxFIym WsVLGQKtNIJzxEfpC4SmZGNnU/ZqS+DcolhI2b9w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bob Peterson , Andreas Gruenbacher , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 4.9 33/91] gfs2: take jdata unstuff into account in do_grow Date: Fri, 22 Nov 2019 01:00:31 -0500 Message-Id: <20191122060129.4239-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122060129.4239-1-sashal@kernel.org> References: <20191122060129.4239-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bob Peterson [ Upstream commit bc0205612bbd4dd4026d4ba6287f5643c37366ec ] Before this patch, function do_grow would not reserve enough journal blocks in the transaction to unstuff jdata files while growing them. This patch adds the logic to add one more block if the file to grow is jdata. Signed-off-by: Bob Peterson Reviewed-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/bmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 39af17b407f00..d83e99fa98b3a 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -1236,6 +1236,8 @@ static int do_grow(struct inode *inode, u64 size) } error = gfs2_trans_begin(sdp, RES_DINODE + RES_STATFS + RES_RG_BIT + + (unstuff && + gfs2_is_jdata(ip) ? RES_JDATA : 0) + (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF ? 0 : RES_QUOTA), 0); if (error) -- 2.20.1