From patchwork Mon Feb 21 08:49:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 545012 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 D8A28C433FE for ; Mon, 21 Feb 2022 08:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345895AbiBUIyG (ORCPT ); Mon, 21 Feb 2022 03:54:06 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:42138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345213AbiBUIxX (ORCPT ); Mon, 21 Feb 2022 03:53:23 -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 44FB91A3AC; Mon, 21 Feb 2022 00:52: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 BC3B06113E; Mon, 21 Feb 2022 08:52:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6F16C36AE3; Mon, 21 Feb 2022 08:52:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645433573; bh=foq7aWkmTN8QQXTsCm8X6UhWUOoorR7j+iWs6BYq42E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v30/eEW5xzx7+B+0VKM/wJefMwscKgMlCCnswuFc9q7KyGje+pS8CSNpFvQIrSzd4 RqVpVC6v4XhC+JZwhCbHzVUeAxSpSy8sEEJka2QaJoanqUPnjcLzrhrJGN1Zj3dy5Z S8ZUNuWILC2XwoDxZSANSJIGD680X8tcqLAxBCfQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Darrick J. Wong" , Jan Kara , Christoph Hellwig , Christian Brauner , Sasha Levin Subject: [PATCH 4.14 13/45] quota: make dquot_quota_sync return errors from ->sync_fs Date: Mon, 21 Feb 2022 09:49:04 +0100 Message-Id: <20220221084910.896850055@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084910.454824160@linuxfoundation.org> References: <20220221084910.454824160@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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