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 AF8AFC433EF for ; Wed, 9 Feb 2022 18:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239660AbiBISgO (ORCPT ); Wed, 9 Feb 2022 13:36:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239615AbiBISfx (ORCPT ); Wed, 9 Feb 2022 13:35:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59153C05CBA5; Wed, 9 Feb 2022 10:35:54 -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 E9C4C61C55; Wed, 9 Feb 2022 18:35:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DA08C340E7; Wed, 9 Feb 2022 18:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644431753; bh=/DnXsTUdY9UKgrMCr9SyNOTRnny2u5Gw8C86zcdETZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVgmaSkcJQPEul6yMiJE2JG3mvB50xi+TT81evFrmQkkn+1UIz9/gp72cATbzJAlx B8jg6bBhKqWkKyPNy/kcYcO1SN3bPA9bPqSjcwoy2VvHYbEK5sb8QKssQE8d1a57px vqvRnrJvMcSNdhuGGwiTssLOo/fyv8bMXLi/a6NFoC7pkhqf5XACg8n+vKh87pNPpL rXHUvqm7U+cUpMB6AAi0hffbSbcMIJ0AksO9lreqnUmBHgyFYVtgRXucziybHJJr92 g7+xfteNCXswunzdsknBFf0zFTPsyHmHEB+MwGh1xIPP/Z/+ELHkfWl3IH7VjF+V2Y 5307vCEpdIJ9Q== 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 5.16 23/42] quota: make dquot_quota_sync return errors from ->sync_fs Date: Wed, 9 Feb 2022 13:32:55 -0500 Message-Id: <20220209183335.46545-23-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209183335.46545-1-sashal@kernel.org> References: <20220209183335.46545-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 22d904bde6ab9..a74aef99bd3d6 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -690,9 +690,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