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 AAE6FC04FFE for ; Wed, 8 May 2024 06:34:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 387296B008A; Wed, 8 May 2024 02:34:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 30F996B008C; Wed, 8 May 2024 02:34:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18A2A6B0092; Wed, 8 May 2024 02:34:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EC3936B008A for ; Wed, 8 May 2024 02:34:58 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 62DDB120A0C for ; Wed, 8 May 2024 06:34:58 +0000 (UTC) X-FDA: 82094265876.27.04D2A6A Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by imf11.hostedemail.com (Postfix) with ESMTP id 34D1040011 for ; Wed, 8 May 2024 06:34:55 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=WaV8uAVj; spf=pass (imf11.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.17 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715150096; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ef2a5cAShirIWZUUtn7EVON2dxOJp6jGNLiGcTqzVuM=; b=Sh2dnc92kUAsMVXYLLKF/MYPSFAquQPJ/CjYhDmxAXTqfMIj5FYQC/ELwrD+z6ldV504M9 ZQZBF4jVcaiJLe8M0PtsrnuM3Z3+03qF9bU1CVKWWCoL7BnbW+eQbuWPGMpo5OI9UwlCGf SQRDPxCzplED2BE/htl4iiFp0bDFilg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=WaV8uAVj; spf=pass (imf11.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.17 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715150096; a=rsa-sha256; cv=none; b=TwzxXeFkiRa3nmJ+Shpx8hf419+RDH0X4i2ZjaJgylwYNq2CjK0Q1chnkrMpKUGTxlN+ln tlOcWGIQJQpMHIL3uvRRre0hXHO14sUmwGcLdRfXEvyGy2Ejl+V+mb1q9m8aVnlhN3+OL3 LGV0iC0VQuylu82skTJqep3yJJZZlXA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715150096; x=1746686096; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=APOtoHE0voeGHGRQZmu8ViVknqEdQFOsrAsV/taQU8o=; b=WaV8uAVjk01zY3HaWtMeg6mciqXLU+y6ycJmnMRZi40TAiROpWGcLE0U I8kAkBT19AVzA940nhjIsOetDxE/LNyS0tD0O7ffWXK8Va6Um52OLkPh7 y+LuCMcEwgmxOJZ1u0p2GKGHssEnpX5cWIiyn9yKi6k1EB4kqy/lXozVS yes0wthOefqORto1TeKHJoLINT0ev/XeamTSBloiUmcO21hWX4DULb6gt nYIUue5THsv4lkPxf2OwIH4OOlyjglyD36Bf3+zuJ7MKk7b11KRykhGeR nzA+PP6swY2Uxjb0Vj7LXcQ5zqu6gtVpnRm58RXN6u5wwTp+j4BqzJn6U Q==; X-CSE-ConnectionGUID: Txk+KspuSni9fcpsPzmQRw== X-CSE-MsgGUID: 5gvWTUZgSkezccJ2oTso0Q== X-IronPort-AV: E=McAfee;i="6600,9927,11066"; a="11112081" X-IronPort-AV: E=Sophos;i="6.08,144,1712646000"; d="scan'208";a="11112081" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2024 23:34:55 -0700 X-CSE-ConnectionGUID: lwvudA58TuKaK1DXKi7eyA== X-CSE-MsgGUID: herrs9BzRNaY5euN0yK5Bw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,144,1712646000"; d="scan'208";a="28875086" Received: from unknown (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2024 23:34:51 -0700 From: "Huang, Ying" To: Kairui Song Cc: linux-mm@kvack.org, Kairui Song , Andrew Morton , Matthew Wilcox , Chris Li , Barry Song , Ryan Roberts , Neil Brown , Minchan Kim , Hugh Dickins , David Hildenbrand , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 10/12] mm: remove page_file_offset and folio_file_pos In-Reply-To: <20240502084939.30250-3-ryncsn@gmail.com> (Kairui Song's message of "Thu, 2 May 2024 16:49:37 +0800") References: <20240502084609.28376-1-ryncsn@gmail.com> <20240502084939.30250-3-ryncsn@gmail.com> Date: Wed, 08 May 2024 14:32:59 +0800 Message-ID: <87a5l0lso4.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Rspamd-Queue-Id: 34D1040011 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: fhyri4sowiwsim61giseqwjbyp98csrd X-HE-Tag: 1715150095-161490 X-HE-Meta: U2FsdGVkX18xZc/TIJ+MwaIKZEdhsDpRpsd7D8PhAlixTLk2SNQC3seC4yJpkTIdt9fOuGOoXHEJqD4phC6LpVgFOwWh49Y/xnejFImmpgv99W2VEIJxxhX7yGN529F7tmbxM0ux6vN3op7mqljUgw4icKAJkGZKF+ct2gNd1EvQr8LdamO5sHfAYGKowBX4XRXiYKPXcWUTTrsYxZOO5QI88sYduvjDl9jkDa3PCicpnw9xNiyNduCBEoE37x46WsQCyK/yE0TcomztRtT6KTZhasI3T9HEdPIkM/EBuJceWT+YkHNP1tO/WpZ+cqGQwkpAAHzbesk9h0Ck2IDa522KC+xdR7Or28et/rzON5TqzQLNwbLEm1ehIqZtZfTiiKcQjxEZZwrp/uNNK2ljKaquLBGcoexKltVOci3y8q16WaX+926cvH+hTUbgDeb5VSpK+RlLbaM2HKKgN4Zu2xPxAlL2WKyy9KKKaCbf31wMIglW2RLqFo7S7hgfcBHSv95QBlQftE0zMQx9K86r07iT8QBVmyh9Kr8Df0UXOUNi3xalk7aTVjtok03slVgi5w3dJE2itQaVUYw1NNeFep88k8Ri5aE23yImRzmEORklk7rel1o0KcU/8R71fnx6PTYBa1qooSdhQymkgM/O0Rj/Rv8qbim6Mt+6z3PlooE7N/X7nIyAY3Md+AqVNPDtAdH8hWUqr0mnOvZkzZjcFf/iIpVGrM4rs/t2xZNw2nEQGrmVL50SUNQwGQuETk7lg2U+sjI3V3I5h3FHfXIEf0SaXfcD7LSMp8z0tY5cGINiVroNhmBXHbUALjBAO+tKqOF50QNK2BSmUFrTNYla1bBDrHVaIf9YXIrqwxc8l7xn7VQKyjZdAQTS8yVqnz7xhU692maTpqxbhP0MmzVwXCigJUf72o12GLfkoOcseqS4jFxvmwcUg9PD29PofEuHv6SalCGJ0bBm7kyrAf0 5JR21KH1 Ke2b8FAGB+Wr8S+HPoUO4Kd5c1Pvyv7tQljN50enCJi9qiA1hPWtS7YUl884sls9sZEse70yCakOfZMKgDanjHodf5WMGxhDk9JWiA8qHFg8JcDSFZJdjI9X4hYkYrgUJywynqAgLX2nZK/IJpoSEByVlX53A6nnrxX5xUkUJg27N7Q689ayeQIxqtE6u2CbW6+SeolSz2mkBCz7p7+TPmG4eZKDFfXaLSdS7LvKvza8r2jXNbC/RaE+ybvKVVJWRTuHVEHTEXwC1PIHzG+gXhCWFUgf8L9T/e5A5zEqkqpecClEq3I/2uWji+EN2xPcjD+CPRTz5+vBQG2o= 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: Kairui Song writes: > From: Kairui Song > > These two helpers were useful for mixed usage of swap cache and page > cache, which help retrieve the corresponding file or swap device offset > of a page or folio. > > They were introduced in commit f981c5950fa8 ("mm: methods for teaching > filesystems about PG_swapcache pages") and used in commit d56b4ddf7781 > ("nfs: teach the NFS client how to treat PG_swapcache pages"), suppose > to be used with direct_IO for swap over fs. > > But after commit e1209d3a7a67 ("mm: introduce ->swap_rw and use it > for reads from SWP_FS_OPS swap-space"), swap with direct_IO is no more, > and swap cache mapping is never exposed to fs. > > Now we have dropped all users of page_file_offset and folio_file_pos, > so they can be deleted. > > Signed-off-by: Kairui Song LGTM, Thanks! Reviewed-by: "Huang, Ying" > --- > include/linux/pagemap.h | 17 ----------------- > 1 file changed, 17 deletions(-) > > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 850d32057939..a324582ea702 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -918,11 +918,6 @@ static inline loff_t page_offset(struct page *page) > return ((loff_t)page->index) << PAGE_SHIFT; > } > > -static inline loff_t page_file_offset(struct page *page) > -{ > - return ((loff_t)page_index(page)) << PAGE_SHIFT; > -} > - > /** > * folio_pos - Returns the byte position of this folio in its file. > * @folio: The folio. > @@ -932,18 +927,6 @@ static inline loff_t folio_pos(struct folio *folio) > return page_offset(&folio->page); > } > > -/** > - * folio_file_pos - Returns the byte position of this folio in its file. > - * @folio: The folio. > - * > - * This differs from folio_pos() for folios which belong to a swap file. > - * NFS is the only filesystem today which needs to use folio_file_pos(). > - */ > -static inline loff_t folio_file_pos(struct folio *folio) > -{ > - return page_file_offset(&folio->page); > -} > - > /* > * Get the offset in PAGE_SIZE (even for hugetlb folios). > */