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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B392BC61DB3 for ; Mon, 9 Jan 2023 05:18:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCD5A8E0008; Mon, 9 Jan 2023 00:18:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C57088E0002; Mon, 9 Jan 2023 00:18:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA9748E0006; Mon, 9 Jan 2023 00:18:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8B4ED8E0001 for ; Mon, 9 Jan 2023 00:18:22 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 613A41C56C1 for ; Mon, 9 Jan 2023 05:18:22 +0000 (UTC) X-FDA: 80334104844.06.CE25026 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id 2C87F180003 for ; Mon, 9 Jan 2023 05:18:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LbvKlGSO; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673241501; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UvH9ycUllkHxgh2ZsVpQIK1Y6EVpAeDrvEMZLSZxFIM=; b=osbVp9qS4j6x9NnLzil6XuzblljCJ3qUzQoMpsdikz1RcMWj1LrfI47aIoqVt4MdSLnXqX jNjzWoNJiSPiUp+ZMq7ntzbsqPudwVxaSAAy88QXrv38rBtNxSQj26lV+cBjV9UP6TDYho OsSZGKgix3c8IoPvjiV6OjWIr94ZBDk= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LbvKlGSO; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673241501; a=rsa-sha256; cv=none; b=Kds910uvvcGp513dq9GbqoERINfqeaMuvmsFGaEuUxZGTPlTuWWfZGjghjUw2wu/fh55da BPXNnx3ISF0p/g8IsqRspeuCqI6Zjl5LYtAXGgk3KYItVcLCJ31Schs62LdXKQz7YYer6V G1JOwE1xgS0Ts3gK6b1ArnKiy4EwiW8= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=UvH9ycUllkHxgh2ZsVpQIK1Y6EVpAeDrvEMZLSZxFIM=; b=LbvKlGSOOBJGYKzPTxzwC51OUM 4pi+Lu0AKUj5674G9a9HGH2avOJVNKMzAho+9kZg1BLmoaQWZGFapak9qevcs5vCNX4cowDhjDTMy fecc/Mp4vTjQxDqsMnH/5D+7oIUueYz/KbNAPa3cSljyAFyidWyyb6gUZ0lx9YaUaNCpo18r76syB DIIOJfRRf+AcFziAPXk8JB5K4EdITspdaBq+l84JN1RdFBkFF+cD7zAqa1vPwm8jweofhVKpcmaFM i137t3ozQkjZdDD9Vrt8EYXLDGZ808AQNdtpYA+unsLNTlfaq9tJjcQ3MUy87+YUWevUMEmHHRCjb WlbLNRRA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pEkYD-0020xJ-SI; Mon, 09 Jan 2023 05:18:25 +0000 From: "Matthew Wilcox (Oracle)" To: Cc: "Matthew Wilcox (Oracle)" , Jeff Layton , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: [PATCH 08/11] cifs: Remove call to filemap_check_wb_err() Date: Mon, 9 Jan 2023 05:18:20 +0000 Message-Id: <20230109051823.480289-9-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230109051823.480289-1-willy@infradead.org> References: <20230109051823.480289-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2C87F180003 X-Stat-Signature: 439s8icdq7um6i3xntz31rgdwcnpiifm X-HE-Tag: 1673241499-262733 X-HE-Meta: U2FsdGVkX19efPeIz8cIn8JvvldGdndNKlS2UIKNWbxafSOe1uAKoMVYyUMmXL05YzIEdqMJ6Wbjx/kzZQ0Ip9/DJB8tjZXLJ86v/+bO5lSyfnZqPnCLDirts1yFZcNELHcqVvwvOjWpfR9q9repk9oh7n61oY3elJJLDb2Cc6z9o4CuU55/2VBSPiYlAeOXAsuoaflkF5phv6IpP1TQbyS15UGGK0/QE4PD5XcQW2bKUBT9Rn4vcs7Wpbp9d+mMmpIic+wfCGja2yDRdoktzdyydJI+9J5mNVji1JpxK7hXfaq8kT0TV6DxNR9NCzyCWCIhu+aQLm8MbCTMTI5KAa5KqbKheqF5ai1umyes9mw0FPJkQYNHNd8A2c78DY6y8FmIICH0T7QnKeod1MF57q/W0QYCSj/wNMqiTzciRggbAotCsY4MT33cZhZkGRDUeeE/jsCcs8Acq8Rz00kgd0VO2GLzkB+XoP+XJxK5pzB/aeywrTVjo7S8S43LO8nyQxmN1sHuX7VczmMzm4fa7osGf7xK9rssFJpYgKA8IAhnQBGJPtAnVqjgMQDfEotYg37WlXRvAR/ujSaJMalwfd4c3r10aJOv+V+FAEHoFRCiLCj3NdqIQ6Xr3RoZf1FH12dxieeHtSq9IIxsx78Za//TEAiuCY5xXXxJUjUtukNuZzGrhUgvxUupCSkcU7TOY+ZJ9KEkmNC/+fuWmzPz6w9fnxCIU72a7OIPwjt77S975OYaPVxv6+ELw2lXsv5hF+yKM50dobjn8zDu57S7O2ZjZqO5ArlFgMGzt+TpUkGZQBqGAR2Od9y5ebJbbWc6GY195vO+6PWboMFLNirsbBvV0hi4xyPvVUGxD+ygEnoOaWlyAueROiFIoW98RK0MSyJ20UpoEWGdmiGEyxXTUoaAKotwJSJVzSbgSg+P2Ew7Gxa5V1QlcA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: filemap_write_and_wait() now calls filemap_check_wb_err(), so we cannot glean any additional information by calling it ourselves. It may also be misleading as it will pick up on any errors since the beginning of time which may well be since before this program opened the file. Signed-off-by: Matthew Wilcox (Oracle) --- fs/cifs/file.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 22dfc1f8b4f1..7e7ee26cf77d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3042,14 +3042,12 @@ int cifs_flush(struct file *file, fl_owner_t id) int rc = 0; if (file->f_mode & FMODE_WRITE) - rc = filemap_write_and_wait(inode->i_mapping); + rc = filemap_write_and_wait(file->f_mapping); cifs_dbg(FYI, "Flush inode %p file %p rc %d\n", inode, file, rc); - if (rc) { - /* get more nuanced writeback errors */ - rc = filemap_check_wb_err(file->f_mapping, 0); + if (rc) trace_cifs_flush_err(inode->i_ino, rc); - } + return rc; } -- 2.35.1