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 7DB10C636CC for ; Wed, 8 Feb 2023 14:53:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 877D16B0074; Wed, 8 Feb 2023 09:53:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D9426B0075; Wed, 8 Feb 2023 09:53:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A2476B0078; Wed, 8 Feb 2023 09:53:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 581596B0074 for ; Wed, 8 Feb 2023 09:53:50 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0BF301207C4 for ; Wed, 8 Feb 2023 14:53:50 +0000 (UTC) X-FDA: 80444419020.18.FF0FC2B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 49600140005 for ; Wed, 8 Feb 2023 14:53:48 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jhLXZ5eO; spf=none (imf23.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=1675868028; 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=5twZFLWxkhGrNUYEW65e76d9+Wc/N4CV9H47V5oY874=; b=C4If+eXpCSoCr86Z09AK7gpZ6Sj45F1HtBRMivf+AT3vaJ/hcP1tPqNKEGj67/dIEuJD46 8wzC/DxItR/Z6AWEb65tOpW0910ppaVqQ7lf6QvF70/tutFlC8YLIG+cALEY/MrqRpGofo 23W6i1gYBwoVzQJWBLsTurpTos2boqs= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jhLXZ5eO; spf=none (imf23.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=1675868028; a=rsa-sha256; cv=none; b=MqowcFdgAxIhwAmSVx5VkPZ4eGVmVFMG011n9pvF11W1+mKt0lkdDCdRwCrYgKPkbpzPzA tWn68BD/fxvBpCxEr3vEUiIORSUIke9R1YAwQp27Tm6BDOUhew9DpVpCXemw4Hig6+tI1V 49EPTREyfIpw0/TdGYuWRfDS0gAkAtQ= 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=5twZFLWxkhGrNUYEW65e76d9+Wc/N4CV9H47V5oY874=; b=jhLXZ5eOcYzyv9Lg+xvTxRJyod htyi0O7wkyJihprDroJwDFHYs9W2CcWo4Bs4BJHOjW9nuD0JUNpaFK5Wa61HKdQkPMSQCLgqkyg/M DV0Dnzg3tzPaqy0lbr+4FLoiA+i5arMxHxV8SW9J5hc9kLAkar0MCXj/KCk2QIbirelqMTDrVme0R A3URQMf7LwUPHnghYb3mTGC17gS+DN/dNrYNpJq8NeBmPVZYYyIzaz6Pz0nQ9H1PKke7jbWoVWrvx J4o/VqVfhlKIA+0WzL9koVRa5NLxuH5MvC09KZRtCGqBVSbjjKgZHfaSSwR5LK124VOts++i7+9Hw H0agG0oA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pPlpK-001HwR-SC; Wed, 08 Feb 2023 14:53:38 +0000 From: "Matthew Wilcox (Oracle)" To: linux-xfs@vger.kernel.org, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 1/3] xfs: Remove xfs_filemap_map_pages() wrapper Date: Wed, 8 Feb 2023 14:53:33 +0000 Message-Id: <20230208145335.307287-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230208145335.307287-1-willy@infradead.org> References: <20230208145335.307287-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 49600140005 X-Stat-Signature: z4z5erour454dse7uhkj79d1tkposqrp X-Rspam-User: X-HE-Tag: 1675868028-488221 X-HE-Meta: U2FsdGVkX1+TtOwl0zWu4IUK2Szfw1yVTDgrvmFEHFwAvbNE/p1ydXm9i29OoRWKhBCRdjJoR45xPBtAC4hpIHlAYF+NmxpshSm85aiEO4/cvRdHLcdWhv1Xn4FGeTLo7CsCotoamPMjcaeRaeoTfmuc8cGizLUIoVg1S04tNlmdbhOhi+6TfJIzssk3dSq/nrBLICcBXTgHKjFICj8VDoD4lM6oeo5iC2+0lj7xf2wh22JdtL+MrKtlFFy68lBlxB5QO1favHzry5SbzMzlyRfqcmmFgUwPNhMr7Z6il7OD4UhhfC1XkK9bxOP4All9h1I3jfeVtQcaBp4j3GiRCF7JanNAyZZkpLLc28LXyoSVbAYaFvnb3rqACBMjeP4mpMkMCuDSqvJbUbtiFy5JXZ5+5smifxaEbUoQJMhFG8XB+BSgWfqondvm4YxlS2M87QLb0NG9SHSBwlntexO9rGe9eYWvexTAm7eUhiwAt7DIxydbO9//95z3UC/YMZGT758dAHjbVOGpbX29BHn8Tan42S2WIQDIxKjEXrdjlqOfm7Z6S31l+CDGIkRcACx52CPH+AG2uj/w+b7ahBn93QIczzmnMJdnLOCQifErNodrz3r8Ewa8X3WrQ6ndAZZxECtHYAfY6rEemzmvoDsK+WOwc6XyWueqQ27Fgoe0q2NAqpe0n7SpPWNo4fqEi81buGnHJ88B4VWuS47tg5frCkqSLzrb378paXZvyJ9ztn0d2XYGg/rFO2jHQvdV4NbutSBdnA9ueqAKJ0PZUMYb+Pedh88I5PpYcS+GOXVNZyMgm/stKfAloR/PvJ7FCLV4xHBdJvOWOa7bXIRJjUcBxQckszk0otxkauNgvkCkTmPxJMWJ3jPKvy4dvub3oMLJs6qUk8ThuUuibxBSMKI4zPPIyjFj7i8Jh66T7tY+RYAIe3F+/GPav3Wm2hMlOztsvSH0RZ5V43fpw/A3QHe Y7yk9xVK WBYLyJQeIAowvCfmxPBXfrumvdxY4TLt8gEo96d+pOSNQEXMiYOYp8//kpiqLCKCssFin9AL2ak0ou2kQ15OUTO6g7Ost53hY+a3Wi/uNtsnj3qHKWhCfA/sWPGs6JQtDRs86Q/LxnPB/RvH59bhBB51tkqPxpPXd9MKsClaD0SlNP4xvdKscgk+9Su9H+o4ZgkKIOYbb1fVrV69rvLx9i2CXDUDEYCkGvhLpd3fAneOtTccp2e4VBjB+hQ== 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: XFS doesn't actually need to be holding the XFS_MMAPLOCK_SHARED to do this, any more than it needs the XFS_MMAPLOCK_SHARED for a read() that hits in the page cache. Signed-off-by: Matthew Wilcox (Oracle) --- fs/xfs/xfs_file.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 705250f9f90a..528fc538b6b9 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -1388,25 +1388,10 @@ xfs_filemap_pfn_mkwrite( return __xfs_filemap_fault(vmf, PE_SIZE_PTE, true); } -static vm_fault_t -xfs_filemap_map_pages( - struct vm_fault *vmf, - pgoff_t start_pgoff, - pgoff_t end_pgoff) -{ - struct inode *inode = file_inode(vmf->vma->vm_file); - vm_fault_t ret; - - xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); - ret = filemap_map_pages(vmf, start_pgoff, end_pgoff); - xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED); - return ret; -} - static const struct vm_operations_struct xfs_file_vm_ops = { .fault = xfs_filemap_fault, .huge_fault = xfs_filemap_huge_fault, - .map_pages = xfs_filemap_map_pages, + .map_pages = filemap_map_pages, .page_mkwrite = xfs_filemap_page_mkwrite, .pfn_mkwrite = xfs_filemap_pfn_mkwrite, }; -- 2.35.1