Received-SPF: pass (google.com: domain of linux-kernel+bounces-172762-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: "Huang, Ying" <ying.huang@intel.com>
To: Kairui Song <ryncsn@gmail.com>
Cc: linux-mm@kvack.org,  Kairui Song <kasong@tencent.com>,  Andrew Morton
 <akpm@linux-foundation.org>,  Matthew Wilcox <willy@infradead.org>,  Chris
 Li <chrisl@kernel.org>,  Barry Song <v-songbaohua@oppo.com>,  Ryan Roberts
 <ryan.roberts@arm.com>,  Neil Brown <neilb@suse.de>,  Minchan Kim
 <minchan@kernel.org>,  Hugh Dickins <hughd@google.com>,  David Hildenbrand
 <david@redhat.com>,  Yosry Ahmed <yosryahmed@google.com>,
  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)
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=ascii

Kairui Song <ryncsn@gmail.com> writes:

> From: Kairui Song <kasong@tencent.com>
>
> 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 <kasong@tencent.com>

LGTM, Thanks!

Reviewed-by: "Huang, Ying" <ying.huang@intel.com>

> ---
>  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).
>   */