From patchwork Mon Jan 22 12:38:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13525413 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 7F75FC47DAF for ; Mon, 22 Jan 2024 12:39:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F35E6B008A; Mon, 22 Jan 2024 07:39:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0057C6B008C; Mon, 22 Jan 2024 07:39:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9A4F6B0092; Mon, 22 Jan 2024 07:39:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C4D2A6B008A for ; Mon, 22 Jan 2024 07:39:06 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7D38E1A09A3 for ; Mon, 22 Jan 2024 12:39:06 +0000 (UTC) X-FDA: 81706901892.12.AC08E5D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id B054C40009 for ; Mon, 22 Jan 2024 12:39:04 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ev83hmg7; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705927144; 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=QTcyfpP5bcZKRoP4ztPdz4r44FpI3I5eD9lUKEvfqoQ=; b=YKfIArm7ASSDPUZjcNsY55em5eQtPmzkYRCyq2n5XLxd+VcGC1lBAhI7FRt+TbRgHbdBur 6fgPHphAGKDtQib4gcQH2LsMsCVB1BP8zJdS1+zP2gV9ElT1GpjPHUIt2M/5kvUy1v/99r tYrYZDnUXoJJvwKcDyucpmHABBfolcg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ev83hmg7; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705927144; a=rsa-sha256; cv=none; b=laxSe0wKRsE5llZ004kyFVq+LWkGE++21N/WIRUpdFSOfulsFKAGyDAvLV6KL+JtgkNC99 8PUZDKkJqfS6TmRkTJGjo7/xhKnXLwITJdjJGaoHeWUW7xwHeYU+f3OPi7giLCfijdeH28 VIelLbpmj8dAx+GhgaBa9QdATkfwlXo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705927144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QTcyfpP5bcZKRoP4ztPdz4r44FpI3I5eD9lUKEvfqoQ=; b=Ev83hmg7EeJEP6ub1Xqf66Nb+eZg/s1Utd5Bt+aZciZ2NqoQpeW+UX1HqqQRg/XLOaYQKC ySL+YXOpr4FOQViGAySvHeYgQs9BzdGIa3sJCdWa865JthA34XPd+Za/lUDdNHlXaey46s KqDhO7JYo+LaxBQnqPg2xw6B7vYYj80= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-257-n3Heej4FNhmdGcMa83qE8w-1; Mon, 22 Jan 2024 07:39:00 -0500 X-MC-Unique: n3Heej4FNhmdGcMa83qE8w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA32285A588; Mon, 22 Jan 2024 12:38:59 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A95A1C060AF; Mon, 22 Jan 2024 12:38:57 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Jeff Layton , Matthew Wilcox , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey Subject: [PATCH 03/10] cifs: Don't use certain internal folio_*() functions Date: Mon, 22 Jan 2024 12:38:36 +0000 Message-ID: <20240122123845.3822570-4-dhowells@redhat.com> In-Reply-To: <20240122123845.3822570-1-dhowells@redhat.com> References: <20240122123845.3822570-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Queue-Id: B054C40009 X-Rspam-User: X-Stat-Signature: g71hz7ti8izkgb9qtbiaffr8fuykjgts X-Rspamd-Server: rspam01 X-HE-Tag: 1705927144-491235 X-HE-Meta: U2FsdGVkX18Aw95sCOVwuSruAv5czjKwf34jkQ6GV0HuTzemqwOCe2MII7uWebIblcXPG7OMQyA/uTF8RGNGts846tWk67bJklh8jIblf8swS+P2l5Zlx8yhz1m0D/ZhnlH56WwGQVj/ksmvaK+opHTmOU3JIVuOdIUJBdmfnqPMfw4A5gOwZmMEitA3LMZFspVsmqbc6kTfEIYuijj6ofHLDB5yYepJhVYVJo81ZgKa5iCzOa6QBcxf9z31PExucfpgQcbd+lNGfrfGc6963+q4c3KnaXoWyN7wqla6kL0bhjqsqThH0kuLxhjfRjz2gNaZa4W4lJTPYP+1WsvEaKw0udBvERwKcrxfoRS640A9yJV8YAXu6dZeCQ7Xlv2zKLtN5iMUp8jRO5N4jELtW1n+zHKHM4tuzNLB/CXLK9vktc/RbG42Ol4Nu5LUfEOJfGu/4v95TPbyZ/ZQEr9y36OqLXgfIa8Q+VI6Toeqk6FzDGfJJ+WfwkcYgVp13Q/6OFv/ni/iakcI2ZEhoMuZmtzgag7ehZMEyfZaUpxEdMicMVwhwBzg+/V9k3l5qxtOsOI/LkW4BPCCAeCmxL+4ifEz2FSclq3NV7+8RcoUPL1h7j0ZRuW41WKma+6b7xI9dWBhznt2wR881aW6YVw6TGRb7d8SUnEDuVQQReFgkRHux2uhh//uiBrQap4BCrqf4Dd0GtlhvxwaXwOfGaI6zqXI8djbit1uDUHD9WlVPCjVFePn7iZ7WfMwsfliQbZNOuN1cF8DWkAffNm2pYayrvGjvbI9OBdHCWPki+nIMwQ/T9LvNRLHsbLiFLlmUW3MaJQQ809g1FBG6ufjXMJXF95AIu4C54vBcD73kS6c65eSY2ztJ/8ormgs5SskfVgcaj4RFb8rfDw+t/aK78EK6YH+un+CRuVaXgPosOy3KbtrWI5o0+NLqTJJHuhuNowXR17sS6pcWZ10i00aCVd B1XqWANX Fk4l97IQxxhmR1oVOnyPwdZf9TgtWe1Fvw1MTz+puyc4by4LkpGlbUEt6iAdAbrdpWdlHIcF/nngSSzvWI/v2jKJ7u0qlmS6LFWZQUJEkT5Cxp+lCKLqCcoCW67vwoUmWwzCYq+ytEqlm8I5EztX0MSQMOvOjqWeHF7dYnOH/+PALSb/dW1CJDalZNmmLBYy28zqKTuYHfxpD/QNy+Ma7HgUcBZ/xOKcGof/hJZE9JFG8z7ryEvwm41ho0uiWZfgFZmu//jlmE1A94HS+s0RYNmTLoGOp6lXXfUHmnHyydhMhNnm2Y22HbHOD9CfRWSyCRIHCB+gZNCL7wJIO1jiCRSpvzi6Nrk2RUFHeX+xDlX1TWXQhs6JzmYZ3G+azFmAgos5DtfX5hZlSx58eZDwOhyRrY67+VQN0DPZqQGzwbDMGHPwtNg8qC7EIVpNxgSu0XkSeVX7Af8kX8d5iTrCcOfXnv391ZI8Nhofpj/QAJNDpA0SCQJ0T17nQKwkSRGOqmBUy/sPXWfApkn2rH4mZbOYDv9A8HNJY0IW4 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: List-Subscribe: List-Unsubscribe: Filesystems should not be using folio->index not folio_index(folio) and folio->mapping, not folio_mapping() or folio_file_mapping() in filesystem code. Change this automagically with: perl -p -i -e 's/folio_mapping[(]([^)]*)[)]/\1->mapping/g' fs/smb/client/*.c perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' fs/smb/client/*.c perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/smb/client/*.c Reported-by: Matthew Wilcox Signed-off-by: David Howells cc: Jeff Layton cc: Steve French cc: Paulo Alcantara cc: Ronnie Sahlberg cc: Shyam Prasad N cc: Tom Talpey cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org --- fs/smb/client/file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index 3a213432775b..90da81d0372a 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -87,7 +87,7 @@ void cifs_pages_written_back(struct inode *inode, loff_t start, unsigned int len continue; if (!folio_test_writeback(folio)) { WARN_ONCE(1, "bad %x @%llx page %lx %lx\n", - len, start, folio_index(folio), end); + len, start, folio->index, end); continue; } @@ -120,7 +120,7 @@ void cifs_pages_write_failed(struct inode *inode, loff_t start, unsigned int len continue; if (!folio_test_writeback(folio)) { WARN_ONCE(1, "bad %x @%llx page %lx %lx\n", - len, start, folio_index(folio), end); + len, start, folio->index, end); continue; } @@ -151,7 +151,7 @@ void cifs_pages_write_redirty(struct inode *inode, loff_t start, unsigned int le xas_for_each(&xas, folio, end) { if (!folio_test_writeback(folio)) { WARN_ONCE(1, "bad %x @%llx page %lx %lx\n", - len, start, folio_index(folio), end); + len, start, folio->index, end); continue; } @@ -2651,7 +2651,7 @@ static void cifs_extend_writeback(struct address_space *mapping, continue; if (xa_is_value(folio)) break; - if (folio_index(folio) != index) + if (folio->index != index) break; if (!folio_try_get_rcu(folio)) { xas_reset(&xas); @@ -2899,7 +2899,7 @@ static int cifs_writepages_region(struct address_space *mapping, goto skip_write; } - if (folio_mapping(folio) != mapping || + if (folio->mapping != mapping || !folio_test_dirty(folio)) { start += folio_size(folio); folio_unlock(folio);