From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B212C1865 for ; Wed, 22 May 2024 00:38:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716338286; cv=none; b=nEmk5hjK1FspnnxSJsZIsENTV8I4VPHxwxrVjTp4RtXFaH4h6SgWTw+Au7EiRhZH2kfaJHDcvBCZ9S9DfX3Lmph9lYLJ9uaoiDgbHV0UTuCdehRag42nirc2enTGUPoV0AJwrjf7S0QyjuYTgm1+viAC4uJAAHjBRHeJ61P1MOc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716338286; c=relaxed/simple; bh=LAj1b+bnCms4/xk1W3Z5rJaeVNK1RzfKlW1mijUnq80=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=T7Ww9kJEzbiU7MZDJ9cjgPomQ9XHJzUJAMGoueKBojF0yRI+EBQIfY+NYj6n4YYJRE+xir+fXGx0LhO+CzNz1sy2+MLxRi6zLYtKh9nLmjklAc/pRQFEYObNh3PGgI0cv2LXQ/v031QD0Eufa35k/CbU3telVWkk3Pn/1B+aN1s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=BL0kEqqg; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BL0kEqqg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716338282; 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=BL0kEqqgPxvC/qKElxaY4ensU9xUectRs0VwJYY2kvftfGkha68v4JOPB/or0EYwfLzrON X64qrcChwis+6Cghqm00relrOwpQz8gZeCNMm4wGdyT9zL4tBsKnakBz4e6/++yAE2ZYnk Fjt6kQYtUHpv9GrIi10DuFzlEU4nXJk= 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-596-ujAfVv-CMae1XO55U6CHmg-1; Tue, 21 May 2024 20:38:01 -0400 X-MC-Unique: ujAfVv-CMae1XO55U6CHmg-1 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-6f46acb3537so247899b3a.1 for ; Tue, 21 May 2024 17:38:01 -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=TxX3eDxi4pmF9BAGE+MPqkGQGbcj0I4SyReMZ+CkD4+cya3A7mG0bfc3YF0q221QPv JSpGw3IPN4CbIrNSOtT5JsX20HKBfdG3FRhXaPpHhIn9DupkVfa8i3QiSpsNCcfzi9YL yoRu0jeQqrSdJBOejZwwq8ry30wKEsW/s5fvdJi4U0cz0SpWpmD7VHTg3ptWcfWlKtIs BPkxstcPCs22KoAO/5VjJZ0ewfyVM2yNwUsRUiFM90D4T6QX4uvGXwyZbOC0t2p5i0JH bmtWSbKDn2x/dcGPeATFvmA9XXKPNt9CT1jPwA1QGgXm+v0S7Ne1Sbx4AcTTzjc/MiTX uwgQ== X-Forwarded-Encrypted: i=1; AJvYcCVdHeNt+NRB0DwzaNm6QJD+id+FzSptw8BWiagcjNi9MsCpQ63hQl5HE+e1QCEe1KtxSZ/9/ijBeQ12RAyzEPvWQ6/l0O+rFGBJO38x X-Gm-Message-State: AOJu0YywRY9pgwHA31YcEZj9X5C0A6i+JrugTtYq4SM9yxA25H6933NL sMnoUtXrtCWpwstgPfV24P74HUJNI6dG2A3FoYeViRwKTojEP6KShnzHqHy5Y6uXQONA/RJfuIn s5WsUCgywlWzp/xu71n6R3wvfGhGVHqHia9TvA8oq9/t0FFjbBFVSczPdYiX9DQ== X-Received: by 2002:a05:6a00:2e02:b0:6f4:9fc7:d239 with SMTP id d2e1a72fcca58-6f69fc6d156mr18259115b3a.14.1716338279902; 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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> Content-Language: en-US From: Xiubo Li In-Reply-To: <20240521175854.96038-4-ryncsn@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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