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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 57303C43603 for ; Wed, 4 Dec 2019 18:27:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C75120661 for ; Wed, 4 Dec 2019 18:27:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575484041; bh=j4xPOJci6Wsf0GGfhCEbTb7ehst3axQ5J//yKE/j1sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jAALvhQ3wDUHCoUB1o9fOVISpw8xbD94qvd5gU1TMYwAIJebr18uyMcIDukbjf3Ke v8cT4jZyqgdgefsPSlg1B7kEScViYW0T8nvWpP0l77Q6Y8hgsezdLGxHTZYXoKBNTq 6T+BwK3MsFJLjwdQhg9RfMjmWYOg6wnroXyMtT7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728926AbfLDS1T (ORCPT ); Wed, 4 Dec 2019 13:27:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:33246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728788AbfLDR6c (ORCPT ); Wed, 4 Dec 2019 12:58:32 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C09562073B; Wed, 4 Dec 2019 17:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482312; bh=j4xPOJci6Wsf0GGfhCEbTb7ehst3axQ5J//yKE/j1sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OdT0ZyltfIe9OiqVvRcdQh1SNgwcKdcLnaouDFzKMYW0V2QhkkZClgSqyYVtokgcc LbV+yPp6+9Ew9mbzw6yEufPiUCImyu7sVCu16QfgokMVMrNl5yevfjGbG4bbkO1czD VgxeHn9JmIaK8slQQHovqT4DPgEi7cTIkfyTm1y8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bob Peterson , Andreas Gruenbacher , Sasha Levin Subject: [PATCH 4.4 35/92] gfs2: take jdata unstuff into account in do_grow Date: Wed, 4 Dec 2019 18:49:35 +0100 Message-Id: <20191204174332.685972869@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204174327.215426506@linuxfoundation.org> References: <20191204174327.215426506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 09476bb8f6cd0..f0302e09eff99 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -1235,6 +1235,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