linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kairui Song <ryncsn@gmail.com>
To: linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	"Huang, Ying" <ying.huang@intel.com>,
	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,
	Kairui Song <kasong@tencent.com>,
	Steve French <stfrench@microsoft.com>,
	Namjae Jeon <linkinjeon@kernel.org>,
	Paulo Alcantara <pc@manguebit.com>,
	Shyam Prasad N <sprasad@microsoft.com>,
	Bharath SM <bharathsm@microsoft.com>
Subject: [PATCH v2 5/8] cifs: drop usage of page_file_offset
Date: Wed, 24 Apr 2024 01:03:36 +0800	[thread overview]
Message-ID: <20240423170339.54131-6-ryncsn@gmail.com> (raw)
In-Reply-To: <20240423170339.54131-1-ryncsn@gmail.com>

From: Kairui Song <kasong@tencent.com>

page_file_offset is only needed for mixed usage of page cache and
swap cache, for pure page cache usage, the caller can just use
page_offset instead.

It can't be a swap cache page here, so just drop it and convert it to
use folio.

Signed-off-by: Kairui Song <kasong@tencent.com>
Cc: Steve French <stfrench@microsoft.com>
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Paulo Alcantara <pc@manguebit.com>
Cc: Shyam Prasad N <sprasad@microsoft.com>
Cc: Bharath SM <bharathsm@microsoft.com>
Signed-off-by: Kairui Song <kasong@tencent.com>
---
 fs/smb/client/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 16aadce492b2..56ebc0b1444d 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -4749,7 +4749,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page,
 static int cifs_read_folio(struct file *file, struct folio *folio)
 {
 	struct page *page = &folio->page;
-	loff_t offset = page_file_offset(page);
+	loff_t offset = folio_pos(folio);
 	int rc = -EACCES;
 	unsigned int xid;
 
-- 
2.44.0


  parent reply	other threads:[~2024-04-23 17:04 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-23 17:03 [PATCH v2 0/8] mm/swap: optimize swap cache search space Kairui Song
2024-04-23 17:03 ` [PATCH v2 1/8] NFS: remove nfs_page_lengthg and usage of page_index Kairui Song
2024-04-23 17:03 ` [PATCH v2 2/8] nilfs2: drop " Kairui Song
2024-04-23 18:48   ` Ryusuke Konishi
2024-04-24  1:57     ` Kairui Song
2024-04-23 17:03 ` [PATCH v2 3/8] f2fs: " Kairui Song
2024-04-23 22:58   ` Matthew Wilcox
2024-04-28  3:17     ` Chao Yu
2024-04-23 17:03 ` [PATCH v2 4/8] ceph: " Kairui Song
2024-04-24  0:03   ` Xiubo Li
2024-04-23 17:03 ` Kairui Song [this message]
2024-04-23 17:03 ` [PATCH v2 6/8] mm/swap: get the swap file offset directly Kairui Song
2024-04-23 17:03 ` [PATCH v2 7/8] mm: drop page_index/page_file_offset and convert swap helpers to use folio Kairui Song
2024-04-24  2:17   ` Huang, Ying
2024-04-24  2:56     ` Kairui Song
2024-04-24  4:05     ` Matthew Wilcox
2024-04-24  6:45       ` Huang, Ying
2024-04-24  8:48       ` Kairui Song
2024-04-23 17:03 ` [PATCH v2 8/8] mm/swap: reduce swap cache search space Kairui Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240423170339.54131-6-ryncsn@gmail.com \
    --to=ryncsn@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=bharathsm@microsoft.com \
    --cc=chrisl@kernel.org \
    --cc=david@redhat.com \
    --cc=hughd@google.com \
    --cc=kasong@tencent.com \
    --cc=linkinjeon@kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=minchan@kernel.org \
    --cc=neilb@suse.de \
    --cc=pc@manguebit.com \
    --cc=ryan.roberts@arm.com \
    --cc=sprasad@microsoft.com \
    --cc=stfrench@microsoft.com \
    --cc=v-songbaohua@oppo.com \
    --cc=willy@infradead.org \
    --cc=ying.huang@intel.com \
    --cc=yosryahmed@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).