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 BDA25C4345F for ; Thu, 18 Apr 2024 00:28:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 50B0E6B0083; Wed, 17 Apr 2024 20:28:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BBA96B0085; Wed, 17 Apr 2024 20:28:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 383166B0088; Wed, 17 Apr 2024 20:28:40 -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 156E86B0083 for ; Wed, 17 Apr 2024 20:28:40 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B2A66C0DBA for ; Thu, 18 Apr 2024 00:28:39 +0000 (UTC) X-FDA: 82020766758.23.AF710D3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 8DA1414000C for ; Thu, 18 Apr 2024 00:28:36 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FLkqe4mQ; spf=pass (imf23.hostedemail.com: domain of xiubli@redhat.com designates 170.10.129.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=1713400116; 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=3jV3NxPG2VkGcFSCoj+CqZoFen5LhNgf3imIldjqPCo=; b=XeqP47rzUvZe/OeUqFS00zYhSjYuu423ND0iYBoWGkqAP65CMUmnY2691ih8toVhMh8PHO KsvGhe07rZuoWaseDunEEEeglXYq2EshdvBiOK8xQRBi7FIXdxZjdNpaW5P5phmjQ4QE5j lcEFe0+SeZHr3wb5+vNLNzXZ3fTyXQ4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713400116; a=rsa-sha256; cv=none; b=atNupTGplUzLeeNpHnusCIwzfeXQJ5/tLwFl7NwKS2hY8WFzbLIw1DVYQLr6wNZktKUEef d46/g9eyen3hre8Nhmh5t0ESmqiCHVx0mGLmjAyllLYy62gtAOSlKbwtzY3IIjJvelnUOz qXdHUaF5/4ZARnYCIgmbPFjkakL/2sY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FLkqe4mQ; spf=pass (imf23.hostedemail.com: domain of xiubli@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=xiubli@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713400115; 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=3jV3NxPG2VkGcFSCoj+CqZoFen5LhNgf3imIldjqPCo=; b=FLkqe4mQzRcXPQyi8DCyxJhVmbdeX5Jh5lQ95VSXZspBzvACnA5R4ocroeFgMffewEU2rk v0fh8PYxMI/7TRn0f5hpqCqLqhva9L/UPduCmJJ8m1xftIRWQLjKeH8CKW1oNulmnK7/xY m4d9ovhu7j1UCEztUqC5BAyi047rW+c= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-509-5tGQO7zUO1CGzbPstnwmxA-1; Wed, 17 Apr 2024 20:28:32 -0400 X-MC-Unique: 5tGQO7zUO1CGzbPstnwmxA-1 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1e2b1b90148so3818755ad.2 for ; Wed, 17 Apr 2024 17:28:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713400111; x=1714004911; 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=3jV3NxPG2VkGcFSCoj+CqZoFen5LhNgf3imIldjqPCo=; b=wL60tvnolWpKn4fpKZ11vj5pSwJzD10utSoPL7CjERapU3Wveht/vm4vdQj3ZBeOsn YsX5Tfrj9KsDPPdLjcqafk+2aJ82nvfepbwbVS5j8h6DLrQ5M2n2Y7qP4DsidH+UugRQ vGXLhMsyPP6BsmM1u5jhQlgr0xY+AO9hiPbXRY/HP3GY+dLrOTSzFrkrMQJtYDP9rv30 k7c5UeCCPjLPCnnGnJpF9/AO/fciH5FlP1+RdKxvuu4zslQky+E1BqmrfzQbuO1ZaY1R ZJS5KKdfPbjiENn3zWQUm1UTJg2LgEeeVG2c9ymmYpr/iLZ6lOW3rRKzdmOWeoDYmkQN qbog== X-Forwarded-Encrypted: i=1; AJvYcCVD8rRrCKAG8U1D7flqVuNKs9NR8kr5488dw7pBJytvjvoRkiWb2HogHjdxfG/0YUS8GnwgqfzZvz9UpH8pFRBJQ68= X-Gm-Message-State: AOJu0YxuWOXUHQXYnA+Yz9Dlu9ndnyGI01npNqyg7mIzewg5BG/4yvF1 emjEZqnHD0Es5GEDmEuJvPu6dvGm5cjLwNifLZw2Nv2al/rzgtyDTQHqVyReo8HWC1WZ6w3AKes 2VCLWxBFANaDBl2cxIz2+b3wdQ9RdJ1Z8qu+UE9EPu1UR61JpD7VB4ajfBuo= X-Received: by 2002:a17:902:a70b:b0:1de:e6a5:e51d with SMTP id w11-20020a170902a70b00b001dee6a5e51dmr1125495plq.16.1713400111273; Wed, 17 Apr 2024 17:28:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnGifVjUZc6JYr8+X4V1IU5XrfsR1gvJ+hBF0QCqo64SetRIuf3s/amABGErI5D2wT3b3w3Q== X-Received: by 2002:a17:902:a70b:b0:1de:e6a5:e51d with SMTP id w11-20020a170902a70b00b001dee6a5e51dmr1125472plq.16.1713400110923; Wed, 17 Apr 2024 17:28:30 -0700 (PDT) Received: from [10.72.116.40] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id x2-20020a170902820200b001e042dc5202sm238888pln.80.2024.04.17.17.28.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Apr 2024 17:28:30 -0700 (PDT) Message-ID: Date: Thu, 18 Apr 2024 08:28:22 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 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: <20240417160842.76665-1-ryncsn@gmail.com> <20240417160842.76665-5-ryncsn@gmail.com> From: Xiubo Li In-Reply-To: <20240417160842.76665-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: rspam01 X-Rspamd-Queue-Id: 8DA1414000C X-Stat-Signature: txwp984cui7k4wapej7o5ugh517y5nmm X-Rspam-User: X-HE-Tag: 1713400116-637085 X-HE-Meta: U2FsdGVkX18n4rShHb8S25v8fLaynSrmnj6az7ILI7p581tTK+sqPGNt8bUngjVxnUQskRlVO+tw+qLM3KbIFNqkzLArVIuZyRnjrlhBcYUnrP8uGZM9TUw1s/UPL2v2Fbc06yeBNemdnoRs8AOetbciRysK2szVHOob8TKkYB/+pP4URaQubVVFvBCYBYaNClMY4DeTT6STIx+Lk78qLXD23iWMzZ8tz9otdFZfWq96tdCtFi4JNhsUWz3KTVwm2F8FO/ut2KjPPytgG7qi6O3/i8LFjtC4eQ1eozvzuFWDh2GpRy4kzFGieuw7iQ7zJOgyDNd0eoeJMws5WK1sLq85RM+k0L7gYVSHqFpHXigcTsBghijC84f8R1JJVokhwWk1bGdzS9CMltSTEBVbMU+xRNrhbGwi0qHTCABEXRYOahb9PQBIzjxA+lMo33QwmkbE8WgM6G2usNVZ/yIzdpEmksQm+Ezj3njaErROS9MWAiNyA+T91lPhtNMG4HD9f8Z3O0+9UJjfgcClFxoRf6Xw5GobL/eO2C2EqVSX1MaqBkyj9fbsiUOe0bkr0dHq5mSwN5SHG/A1gpyizGlPV37183E+5DHzEg//Re5ZOIGotcaMP8SD9/IsszKFlVHQ6I11RLCglz7hy4Oo4EuHfxKpkKSVN+shGlkqi2p04tis95cw+rRfdWUg8ivKErt/+Yxm83CX7cEc1EDwYchiH6yHgr0A06SRoI4irHQ5wyW5Cvvk48NcjCL5ZTrZwW5ZTQ6iaZTroyG7OWllnkQYvehWnQDg+3lbx0mLXiTIbnT1754nr80WTQmA1bzryLSdltOb+klehqeT2eMdK7qrHwc9pq39rEYMMwjl68i+pblKhJIZFU2elNoyPDBAGxeIA+KzMliZfCohd94ZwkitGTL4D6CwKKADH+1O7cdNY+RxUNj5f78sd1GUuo8DLCqhOFUVnjvXykjom91v+Jg X/RaBxKr UhI50Y6jsDKjQZ9GwWz3DV9PqPV87Gp6Iu8Vif5a05JfExluhjnF5XOV9scVUd+VaBO/TmDGtc4WwgWdPsEcR3BNuvelTSh23Vu8VYHu4c4jyrjwnjMfHYfPQaDDmPysNihu6tTVR3G1IH0CS4Fpwl4/7wS6AZZ18bdNDjFZZVDnqeyQ1mubvvbgLigmmQO11L0ysdHTfXw8HSVe2kg8BtzW7StpkbKTQTCHigkXZ9MFPIme1OCUwayROUYo398Vr682jvJzF9BZI9awuV6wVGPC1YxvxlYRGEL6PRpujRqljXoG9NfP13GpFngyV03Km8+sTLlAEOJsFDyDKMF6KaiAG3WXtBKOj2OpnFofmd2VFBSR/s4s1rG5dSSfKNTOcYckAmcIVU74hJdgX2pu30MxwCRmOtgvznrUiEkUfiXnsQdyKICk+cKe3VlfHS1XRvyg7jUAThf/FgsznspQLmmdtJRYQkQFHoe8oEycM8ctUHoECR7199POcjcomI3v6oF49IZqIxrSCxSZy9yYpFIOfdOy4cRNGpeYVE0ZtRirNIg/4sWjJ1fkpM4WWyD/katSVbmQagB5qbOe+bIUamr0qWwEL6hBnqlQDptLnEUEwUxU= 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/18/24 00:08, 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) { Hi Kairui, Thanks for you patch and will it be doable to switch to folio_index() instead ? Cheers, - Xiubo > ceph_readdir_cache_release(ctl); > if (idx == 0) > ctl->page = grab_cache_page(&dir->i_data, pgoff);