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 15C93C25B74 for ; Wed, 22 May 2024 00:38:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14AB26B0083; Tue, 21 May 2024 20:38:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D3706B008A; Tue, 21 May 2024 20:38:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8DCE6B008C; Tue, 21 May 2024 20:38:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CAA6C6B0083 for ; Tue, 21 May 2024 20:38:07 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7CF3BA2335 for ; Wed, 22 May 2024 00:38:07 +0000 (UTC) X-FDA: 82144169814.23.DCA34A8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 5ACDF140008 for ; Wed, 22 May 2024 00:38:05 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HYbiPA5D; spf=pass (imf09.hostedemail.com: domain of xiubli@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=xiubli@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716338285; a=rsa-sha256; cv=none; b=jkiinD16TsNB4Ocl1BT7SmgtDfAk/vnQY6a330cyzy8NWgi0FawVaacrZlZgFjotV4MmtG v4Vo7KDEqJBfUpvCe8OEF5Uc5EKqkYSNwwD71MZgQTI2WbJlXsC97kIXeNK5T6V8ePtmLG pm+G6vPOIJEnCJJiUBncKpPhzPn2gvQ= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HYbiPA5D; spf=pass (imf09.hostedemail.com: domain of xiubli@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=xiubli@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=1716338285; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Z5+Ml59SARQSuVhVqvLQWFYKARbZIUTwBnysaBLWgyU=; b=rVyDH1eun8jb688P7okSe0muBXv6wp6L9PA9Qf2595by2X5l5mR/E0C/RBJsbRlwX8Ezh3 TX7DY3n0lDOIhv3BB37porIX8D858I4nw3LIpciQa3hlOIDZFNyQ60R/slwCesXnzwrAfX uy6PdXWO874xHbfpcmgCH7/Baxd8PrY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716338284; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z5+Ml59SARQSuVhVqvLQWFYKARbZIUTwBnysaBLWgyU=; b=HYbiPA5DPB9T4k/Y4OkbIV6k3tIkGieSdBiCqEnIcqv0wFxmS88BhH4xUoWH9e9AznvsjW e/w7W2yd7h+ST5ziXJs1dC9cxqvuAYjvUxMndAhIO1uq3jGAeLJ32Y/Qfp5u3ACpa7SZYw hGjEMs0x6H/nCQJIgJFfS5oi77mBBvQ= Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-688-ZcGx_dtHPrG9Rk2ZPGJB5w-1; Tue, 21 May 2024 20:38:01 -0400 X-MC-Unique: ZcGx_dtHPrG9Rk2ZPGJB5w-1 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-6f46acb3537so247897b3a.1 for ; Tue, 21 May 2024 17:38:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716338280; x=1716943080; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z5+Ml59SARQSuVhVqvLQWFYKARbZIUTwBnysaBLWgyU=; b=ZyYv13RzHuLvnny36isEG8G6i7UNv7aMAKlqUjI5wEryAdHgJxM4Xl1zaPsQxR1tNM rBYT1d2lFT5LyRgncXBL+7AZUlWVFuAKnmrimaX7l1SK8y8nep1hEVNbgI4QRcYWyhpa JjeKtwdXEhq+SDqk5mQuNSK/QpUnvhT9anlOYjAxrsLmGJNRQSxrmFCnmKiOfl3MFHny UFCjxQFRxzhN7HvrCyVF+DyUQdOI6b08FvW+J1GgKOrYWzM2wmxuKBrbB8Vbr+EH0Nyq a+yCddcpfvB3ylISqIl4K8tKQH6Xz04ndgc2fxWCTvzy+qNrMivg9iDU0RbLDN7p2slW Bh1w== X-Forwarded-Encrypted: i=1; AJvYcCWvWRqPBgHGEBade2AjiinDZKzAuErTrZm1NQ+QXjR1/LPkhPesc8P6yjsD8Z20Jjz3n8ITltwXPKyhdjO63bbL1jw= X-Gm-Message-State: AOJu0YzJFTS905EI7CIejDlEH9ektHrxpZ0W1PKaB6q3BDztbMn5adlB GpHi1NodqxDCmislaFtSDAtxkTaSp5gw1rImZki+HrnpfE28wpUq+a7OQt3h8A89V8F38yCi6gf tV+nip08pTWdeJitniJ/DwIVQ0k5uKb9TXQezgS48FTqnAfgM X-Received: by 2002:a05:6a00:2e02:b0:6f4:9fc7:d239 with SMTP id d2e1a72fcca58-6f69fc6d156mr18259128b3a.14.1716338279958; Tue, 21 May 2024 17:37:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8g4v0rGDxwPSEFVgieLMxzSKkG2WDTV5Q9c2aX+9gur91SnL1iT4TrvoZ73SO1oZm9pnZtw== X-Received: by 2002:a05:6a00:2e02:b0:6f4:9fc7:d239 with SMTP id d2e1a72fcca58-6f69fc6d156mr18259049b3a.14.1716338278556; Tue, 21 May 2024 17:37:58 -0700 (PDT) Received: from [10.72.116.32] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d6b71760sm21601587b3a.97.2024.05.21.17.37.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 May 2024 17:37:58 -0700 (PDT) Message-ID: Date: Wed, 22 May 2024 08:37:51 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 03/11] ceph: drop usage of page_index To: Kairui Song , linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , Matthew Wilcox , Chris Li , Barry Song , Ryan Roberts , Neil Brown , Minchan Kim , David Hildenbrand , Hugh Dickins , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Ilya Dryomov , Jeff Layton , ceph-devel@vger.kernel.org References: <20240521175854.96038-1-ryncsn@gmail.com> <20240521175854.96038-4-ryncsn@gmail.com> From: Xiubo Li In-Reply-To: <20240521175854.96038-4-ryncsn@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 5ACDF140008 X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: 87gru57tqcb9nqqz5nkh4oxw4ji5zfnq X-HE-Tag: 1716338285-28823 X-HE-Meta: U2FsdGVkX19E3oJYDyP75LBchzaHh725F9h1tDHFH1xA6fxOcd/Z6ENbHfYNsmc9GzUy2eM/986tzdL+I4zIc7g+T4ArLzAHdwCFR3bN3DVZVzSOaifTUt9GtTOfN7TX7l0pBaV0M6QATWvlyTz72IR6h52yTfBBn91jd6mx1Kmfhw2ZUvf0V6R0aj9lCxJdS7o8sCVwOmCyuQYvaBMVNglkNfNP93lq4yLj0r5SyAuNKgm6bHhCqHidV3AGpmpGIpsljsAghn9gs2BudDz2bKpyiFjHqnccW/p0IXc8V5Pw/jhoqSEAkKz1pM2t/B5Rchv2VmfJw0rK5NHbWTUCGQyHeP4Hj+yzr4/YrKZVzWmENRbL7zC/uD79UO4BVuVigrAo5KsOkifg0ka3AE6s+d9etutY94Ugk9DVgRQTnu5uWEdhI3KV9hB/pwf+/vF0oOeE9qsQST5NnHE89Gf3fCtMiIYAqj5cvH3NGKW+e29HuAatC5MzpAqguSwrq/VS4K+gxKE+KnuhvNrBzj5gKnj9NIKahGa/ttoF0uQ8iW8rPhOFcleu6JPC6Kplfjzi39bIT+XFjNF3f3yIhmTc/3DP+2QnVlnVCCK1KE+2FiKUjw0JXcIdrLMGar26mognu1ZkSH1xRFicyCYFjSDjPdMB/ubzG5TAK3xmkKUO5KMn6VJhLc+GdqVUOWXZd9Vgo+EGiOCsCV5nyf9cK9ju3yWxb7kPphGQiKVQSGhJfPC+u31kGgFLFJTzp2d7EgL/M3OAo5YuBBfgzuO8Nr18TivRdAa+YKoeopslEM1KLgmJQ6CkxnP4uV8wE+saxWPiU6EfTLgkdYpBoK+MDxw3EI/fK+U1lO0cg1wMp5Ls235EFgo0Wd8zpTstwhGknWOKmgj0MLDbL4B3sv+N4BxePzIGa1CCwF6HR/HTbrcZVyPS5NwVw1m2TzzpgOHlcQMxIS78cxaC3AMn5k3WLmc U+rCtbeU M88FY8D62kHe3lxdaA9eRjndFcA21LN8cdeVaGSzJPWHA5MWG5JGF9/iLq1+8pgLSg9zor3W9Uw8g1lP/i4mhwKR55N/XfJHYsUjwnoSv50+zTJxObRxwD8rveJIcbfpg9lh9pzQchKytvvucoCIL55KqPT3tCDEDd02ij/xZQ/+PF4A4qjhJ2DGtkpYk6CA02R+0dhqH03qTxB84hFHXxkC3X+pxwhVE1/i7oKwr9J7mYMmXg8MQl/ewKq3zQNCPmbQagNviW+PktYaGgNyY0qvRIuBvfM4UyDEAFuXlnESeNajwjnE19aVkY6nMxsbYtLh3xbiNkfQKoOF6Y3YHUpVTHT7FPtv/y/kqivd4L7xMLxVFG2r3H+RrzZYuWAObc1L3wRJRGVD2bfIw2NsnRn9PPM1HIUPCalqBu+YltQo9s4QsYeTpQShs4r/2kxJyRn9aEHGhu+2g8TS2oCNhQSE+g/3t4ji2Y/oqJfksrUbYlMrvFBrHuB/kV4zEnRjW0GpFmhFQrJz6dq7TwjYn20KKLJBc2mw3kSptiSb2EFHv+hmFZd6gcSEIzk7KMjAEjXdhK6Nlzfg1ZIKTELxh3E3rO2Qg8MW8b4J4Wolq68CKFHnMW+2KTiyEVJjfuAaVw+Gvk5LOQo658LgMy2K+FX8B5FJCsEZSejL3 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: On 5/22/24 01:58, Kairui Song wrote: > From: Kairui Song > > page_index is needed for mixed usage of page cache and swap cache, > for pure page cache usage, the caller can just use page->index instead. > > It can't be a swap cache page here, so just drop it. > > Signed-off-by: Kairui Song > Cc: Xiubo Li > Cc: Ilya Dryomov > Cc: Jeff Layton > Cc: ceph-devel@vger.kernel.org > --- > fs/ceph/dir.c | 2 +- > fs/ceph/inode.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c > index 0e9f56eaba1e..570a9d634cc5 100644 > --- a/fs/ceph/dir.c > +++ b/fs/ceph/dir.c > @@ -141,7 +141,7 @@ __dcache_find_get_entry(struct dentry *parent, u64 idx, > if (ptr_pos >= i_size_read(dir)) > return NULL; > > - if (!cache_ctl->page || ptr_pgoff != page_index(cache_ctl->page)) { > + if (!cache_ctl->page || ptr_pgoff != cache_ctl->page->index) { > ceph_readdir_cache_release(cache_ctl); > cache_ctl->page = find_lock_page(&dir->i_data, ptr_pgoff); > if (!cache_ctl->page) { > diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c > index 99561fddcb38..a69570ea2c19 100644 > --- a/fs/ceph/inode.c > +++ b/fs/ceph/inode.c > @@ -1863,7 +1863,7 @@ static int fill_readdir_cache(struct inode *dir, struct dentry *dn, > unsigned idx = ctl->index % nsize; > pgoff_t pgoff = ctl->index / nsize; > > - if (!ctl->page || pgoff != page_index(ctl->page)) { > + if (!ctl->page || pgoff != ctl->page->index) { > ceph_readdir_cache_release(ctl); > if (idx == 0) > ctl->page = grab_cache_page(&dir->i_data, pgoff); Reviewed-by: Xiubo Li