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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71F1BC433F5 for ; Wed, 9 Feb 2022 18:53:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241275AbiBISxH (ORCPT ); Wed, 9 Feb 2022 13:53:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240445AbiBISug (ORCPT ); Wed, 9 Feb 2022 13:50:36 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ECA7C1DF8C1; Wed, 9 Feb 2022 10:45:42 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ED9C26166C; Wed, 9 Feb 2022 18:45:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D99BC340EE; Wed, 9 Feb 2022 18:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644432341; bh=+sOF+s7HKahPE1JKaq2pvkIm6o9KcSqFdiRkd45zuQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=um/PmPR/G71995Ij/oG0jkWkaySK2524dUhitzr0N9hMv4gsdRos5XggipUSFultc yB6HQ3Qy6PQJA3z6rNVK2v2w6A90/jvXaFTuMvhnIhxoLTTfQKJNQ7jtED8hb0Boyh +A0gMjzYucumElfX1ba2+5+LnmBvJ20HewyvJZoKcPmwkRhURVI0Z8wVPK5Kl15y7H UwcHqH4+514nd25Hxr5tZC7Chd591Xv5nn56A6ZW1AiGfcJrZMkG3uUbgtNAVGxiF0 GQM+1RYhhvcWksTsnOF52ItdWDt26ZU42lLA37V9XBdTo+Cx3wTlYna4VcCqRgwkZH pqeLjmC6do8Sg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Jan Kara , Christoph Hellwig , Christian Brauner , Sasha Levin , jack@suse.com Subject: [PATCH AUTOSEL 4.14 7/8] quota: make dquot_quota_sync return errors from ->sync_fs Date: Wed, 9 Feb 2022 13:45:00 -0500 Message-Id: <20220209184502.48363-7-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209184502.48363-1-sashal@kernel.org> References: <20220209184502.48363-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Darrick J. Wong" [ Upstream commit dd5532a4994bfda0386eb2286ec00758cee08444 ] Strangely, dquot_quota_sync ignores the return code from the ->sync_fs call, which means that quotacalls like Q_SYNC never see the error. This doesn't seem right, so fix that. Signed-off-by: Darrick J. Wong Reviewed-by: Jan Kara Reviewed-by: Christoph Hellwig Acked-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/quota/dquot.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 30f5da8f4affa..7c364cda8daac 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -680,9 +680,14 @@ int dquot_quota_sync(struct super_block *sb, int type) /* This is not very clever (and fast) but currently I don't know about * any other simple way of getting quota data to disk and we must get * them there for userspace to be visible... */ - if (sb->s_op->sync_fs) - sb->s_op->sync_fs(sb, 1); - sync_blockdev(sb->s_bdev); + if (sb->s_op->sync_fs) { + ret = sb->s_op->sync_fs(sb, 1); + if (ret) + return ret; + } + ret = sync_blockdev(sb->s_bdev); + if (ret) + return ret; /* * Now when everything is written we can discard the pagecache so -- 2.34.1