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 C7783C4345F for ; Wed, 24 Apr 2024 00:03:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE7906B01A4; Tue, 23 Apr 2024 20:03:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E6F506B01A5; Tue, 23 Apr 2024 20:03:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC2516B01A6; Tue, 23 Apr 2024 20:03:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A90726B01A4 for ; Tue, 23 Apr 2024 20:03:34 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2F1BD1A0217 for ; Wed, 24 Apr 2024 00:03:34 +0000 (UTC) X-FDA: 82042476348.21.295DE15 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 1BA141A0020 for ; Wed, 24 Apr 2024 00:03:30 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EQk7ZzDZ; spf=pass (imf19.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=1713917011; a=rsa-sha256; cv=none; b=SVTsobmQtmYXYwCB8prt/OfTARnV87OUWYABq5OViKOGLXD6qchV5HwCLVP2OJd/7pjKeN MaTMKlUELdnlsiRBICiInrIIcTWrtVBG7FSKwZwBjiNlrIaSQyECrTDWDafOZVG6AW58ns an/O2h/k+5oh1qsUA8ksAJMpg4U9N4E= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EQk7ZzDZ; spf=pass (imf19.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=1713917011; 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=+7QM8WAkcLyUMI8zMr5qB785VaErLLFUty72zypO/LA=; b=XcajD9wzye4HbSiM/xcFhM3/GLu3qmqlI+wDQiVZjz7OhkHf0pYow2GRrE6cPM0BapTe2E 2bof+d9MgVt0SFEWve7IEbVrpxaXhGE/6lnotV3Z72hUlg4iMEcs3BvpH96blCLXpEEk7/ CR73bG5GaEzxw9M7bsTAIV4QkzeIoW0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713917010; 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=+7QM8WAkcLyUMI8zMr5qB785VaErLLFUty72zypO/LA=; b=EQk7ZzDZxXBotzc3+8IytlOV7huhSg/L2uu+xNqDxk5uL/X7x9bTrlmNsY/ewP6GT8fVOU kSezsL5qepA1aDVv2rGmOF42IcAfg+K1On6Nigo6sHkYjU89RbYmbzIbmBj2Zj3D5Zrt4j gzZWtt+J6pM70Ry/H03Iigzoyvh0Sbk= Received: from mail-oa1-f70.google.com (mail-oa1-f70.google.com [209.85.160.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-R6BA36-aOIWRuKdQCgTWlg-1; Tue, 23 Apr 2024 20:03:28 -0400 X-MC-Unique: R6BA36-aOIWRuKdQCgTWlg-1 Received: by mail-oa1-f70.google.com with SMTP id 586e51a60fabf-22ef0423c3bso5712774fac.2 for ; Tue, 23 Apr 2024 17:03:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713917008; x=1714521808; 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=+7QM8WAkcLyUMI8zMr5qB785VaErLLFUty72zypO/LA=; b=IT9bNljbiYz7+IZr1F06GeGweL4r3nFtoGY20a8f0l5Bhfd3hEsD/iOgUtDpl+xcOt vTFvcP3k30Me4MwYmN3ZSuzHng2UgfMWB7y8j/Nv6WOmidm06bKcYru0faY2iZAVTSJ6 3xV86lRS0zQPMJWjF33BWn7A3H1o2yY+wqOoj5bG4yNAxeFEjVwz6h6/qUbFwebLbWB0 JijlXVoIbjSg0Kn34WPexOJd5P6uUl5tF4JCF2Cow7fyJXxLaUJNdLOmvrPI9k7HibH1 BksRlsMa7tlu5kc4DxEqy3jzCFyNnaNzpkH4AgJKpY/i6L/2iKAAJOyy3C4oQMMF0tIL TUoA== X-Forwarded-Encrypted: i=1; AJvYcCXePkREVX/S8Aud2C30IGwWQn1E3QS57G0HHge0jqXtBj/9c5Jkir0g0rlZm/VWnJLVk5Fn6qunKwv8JIt+Hpj5lFc= X-Gm-Message-State: AOJu0Yy9bCYD6B3U6CyOsM3apsFFVdBhQlIVQ9tN8A7qpO0wND88f6md gXmY0EXsf1tE1aG7qzcIS3O9MUJIqjTe9pCDocHB6LSeHZAVadGBviQ7VvLntBtQZCv34QOEh+3 raJeHTFPC4xZ5086Z64rDTf/rnQp0GgeIp7QCPwvGiWpyx0TJ X-Received: by 2002:a05:6870:b418:b0:221:1c2f:23ee with SMTP id x24-20020a056870b41800b002211c2f23eemr1001113oap.22.1713917008180; Tue, 23 Apr 2024 17:03:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEOjc1kQNpUxZ3Tmzq9lEvctMcDPvQKtuoCt7wDBTr2svwK8MstO02ep08rCXVV0Zru+v4gUA== X-Received: by 2002:a05:6870:b418:b0:221:1c2f:23ee with SMTP id x24-20020a056870b41800b002211c2f23eemr1001083oap.22.1713917007834; Tue, 23 Apr 2024 17:03:27 -0700 (PDT) Received: from [10.72.116.107] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id m2-20020a638c02000000b005e857e39b10sm10052652pgd.56.2024.04.23.17.03.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Apr 2024 17:03:27 -0700 (PDT) Message-ID: Date: Wed, 24 Apr 2024 08:03:19 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 4/8] 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 , Hugh Dickins , David Hildenbrand , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Ilya Dryomov , Jeff Layton , ceph-devel@vger.kernel.org References: <20240423170339.54131-1-ryncsn@gmail.com> <20240423170339.54131-5-ryncsn@gmail.com> From: Xiubo Li In-Reply-To: <20240423170339.54131-5-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-Server: rspam03 X-Rspamd-Queue-Id: 1BA141A0020 X-Stat-Signature: hwei7gyixzgos56ek74ge1fpe8mgzro4 X-Rspam-User: X-HE-Tag: 1713917010-412989 X-HE-Meta: U2FsdGVkX1/QTnn0DlIuP5W99tXAJd26vpgmj1FkxZiCHK2YWcyFh9wMGw/BKqxDq4TNp56wulf29J6JozyB8Ag93T3jo50YczTiQc6PD0bWPEqlbaWChMecKrtMhh1RMQQPr7HuZop61rfFH+o9bwEeZf/Ou72Ud47ACH7cHL9N60hFBn9v2VGulHQ2p97sgy87E2O51dquYN0xBJX14M8meD3u7r5XciYLG1VP6ou78mg+v0d+ffzqgrEiKzOHuW+axd7KyfkirPfeBecmziGkKj2cb240kLzY+d8zYW3H0y9hi1/lvM/cAum0nVzF/BSguzU206ujyP4WeXrEj9XZPkcrweqKnTweAtRqbHwZVVMilO6ho2MF42MLnivY6DQTKm1qgTtlMcXS0lH/pSK2mRhfQfXRJx2MUvR/yNINSQAZo26MO63h6jUJD63ZKMKlY3gzAjMXNZJuD7KHMICLRZcjpFWABBEJSrR4zxNqQEePkXFu9/bGrh/5GXwcD1UWFmgD9VBK4sQWYRKi+5BODNqzQwXKkeue86sIjF401z8SR39EhoV6rR2K6+wrU/piOmN02TFBeH/PVut/Og+twv0FiUc2QuOUuCmpGa5xBSBvArkZV36NoFONnicMGOD3gFnjscdTI9p3nUIKaWWz+xEHoPPCj7VucermFUw64vW9VXMQE1Aj9yDWH4NK10DO8h3DbwQF6GG1HYbwmZ8w+UlnFSqySmDbedM9C0ZSZ0SwvE6iH+RiMkTvCRFCFcgqSd8SQdD8r9GRquQxNy4T46yXl93a0rCszHJIPdwbGK9CLDdGm0+HHRTKY7TkQJLjEsdORrS7ieChKgbhe2Yb2cnoEfpDhEZ912DKmE779QJafX921sZKX9lG54WCwinVI9nrjqFqL0FD33T/gfI8HuQl90JTrDmkWx2f45MhVu0FvssVOUvvD8vzDcxc/W4FEByk6QPC1e1ME+d jFAtCLcw pUXy8TFQ7M4tgtvEl4ZtZ2Z7IJEf/j4edDVTZZl+bUKCA+yLyPPSp+WV/w/XbhVE7NwGSI0kFQ65IuGz3rpvHcPG53giYfrDi6h1b0ukH0QiD+kC4GF5CaBzuJomtmVOMHG05VTkahE2AKImgXZFKKMPR4/2peA6qcM59EUbn0D9YyYeU+brlcYz6t/jTCcrQfPdNN1yvpGs5T8IxMYkxvK5nmhQZwV+QWQE80cfjWzzVeMQPftZ17Ki+HTfhA3bp0xg5+hQKkQWxa9AFrq/7OokohyoH9pX7ejWNDLXoelpK239Cx3kAXG3jzlK8lakUNUvzk6A0/ZqHnzR79XYP0qmo+AGycHN/52/jNI+Nqq7S0snsyvlogf8eV7A8UJxS2OpyPKKq5PH1iRdJe7+GXsqumNGMhrnq17eK0/412fHubh00e0Rda9I+qHLDqNqQs8RGL/s/uNWXmVOvV+Cfrr2FVutBM51BoViYNULUmQRSoylrAkzGFEM29VjQ+Lfv68yZ0wjEDbNiYrcP3dtVsS/crQrbaWYd4jvNzc3CdOwyizSUsXl1ObxudiYxhC70mV671MzE3LfVpa2h/vVfO5yOl4jvupxr9m4IxHgdgDUiGu8= 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 4/24/24 01:03, 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 7b2e77517f23..1f92d3faaa6b 100644 > --- a/fs/ceph/inode.c > +++ b/fs/ceph/inode.c > @@ -1861,7 +1861,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); LGTM. Reviewed-by: Xiubo Li