Received: by 2002:a89:48b:0:b0:1f5:f2ab:c469 with SMTP id a11csp147361lqd; Tue, 23 Apr 2024 18:57:49 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWYmKQfIDKnFSs3bkpOYdOyozU7cjNbuDu45x6XeMjzpoP46WZ9sBDyr1ewwnS2xPSPQbUauU+iJK/ol0iqpUYRCwMQPUdNyjXYxB3xNw== X-Google-Smtp-Source: AGHT+IFIw8b6KqSJfbUMdy1eXmvQJHDIJ8itTvNYCjMmEo+JDpmH0wQOBw3xDylj7NutSuH7B2kn X-Received: by 2002:a05:6512:1385:b0:519:25cc:6440 with SMTP id fc5-20020a056512138500b0051925cc6440mr1003844lfb.42.1713923868836; Tue, 23 Apr 2024 18:57:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713923868; cv=pass; d=google.com; s=arc-20160816; b=EDKYNqOHRqWhEJtDW0G6b9rwQ/zsHwo2nwuwCY701DdKJlmdhh1EsX1jhfJbpM0MbS 3RVJ7qkHvf14pGjIA0dslQpoLojZOwj4n0HQ2eyeAk1OpccPsqHDIxdKhBIrd+NQMi2s Ypgsi1DtdpY8VHjwBoNg4EkGlvEzNhUySyqC5eNh0/EceNVNmlxjnZ5vj/1lxJ/x7Q1c gkxLWTQky/JMWk69ten4o5YQPZdF0v50YWw8sraqq0RM5a0iK3njRyBpnhxV31664ajj LWSEhussf97+pkwdFfPR/Ub5Q/WGyUDdku01eipfjWLX7IZk7zdTrminC4fqr5n8t60h s6IQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:dkim-signature; bh=ozl4eR2gI7UeFBtqjfRipXEMqkSU7RXdrGoXvouiIDU=; fh=d5lMXHjAPpIhhNybjSRh8Z21WtY1m+V2HGdNTPvseHA=; b=nd/wcyytzmZIa20i51b35xqxK3giA9KRKt1fQTQmKFnLDHxtWdYlTPSJ8ceF81k08B lQcjh47YOqH7wvf41FAxL9tu3asgDPmXx5DQKbQtkTA/RyUfZS0wAZXsKOf+/+kv3f4c RrBBaJkWhtBH+vZz8SbrnSYrlxcLyXdTEjgczLoATk88F+bgj92oniw3bWlNb3vMsBsl NmH8rFvy1HUIIJE6A7OX6xxGcpiHBVqCMz75jv+xmPOuL1oM9DBNgBQt3fz+2bsaebc7 +j+0ONREOKddG1W9YUyMzq870fPt83yLyK/SevhLEx2ylW/8R86DT8UQ5AgESAqkI+wu 6Eew==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XAujAL+q; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-156112-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-156112-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id sh12-20020a1709076e8c00b00a526ae70bcdsi8026260ejc.738.2024.04.23.18.57.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 18:57:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-156112-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XAujAL+q; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-156112-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-156112-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 8CE351F2384B for ; Wed, 24 Apr 2024 01:57:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4FA9011723; Wed, 24 Apr 2024 01:57:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XAujAL+q" Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECDF5101EC; Wed, 24 Apr 2024 01:57:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713923857; cv=none; b=H0hyVq0gCiAKWDoCrtj6ZXMuVFuLDcDmOrInM18MHc5xJeeUtkEZb9FUT8+m3qP9ThgDAuTbYag999cAe3VlJT/Gv4n7lWeQOphhTTPJnFYnWOSItaFwQCBGejPaPLuIyUzu/3nJRWUPjqUnQyTxC6l/MDPVMfXPOhSTfFE6LVE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713923857; c=relaxed/simple; bh=yRXp++eZDtbM35ie9Tz8g6gaborCB6GRXR9pSFU8RHI=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=G8no02Y1w9acN/V/GhVGRsGQqLQxczdp9axrU1pb1Z6jMU4yTxYcZem31fU5bc5Mayx9POvEvPEFWosGGq6qDYtd1o83bM8vCxEF5EGvhwLDWVwnN1QZZIsDWTq7PqMHNlB6uegFK0dzOttF3h7USePqPbEkhNF3c59WrfQHmeY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XAujAL+q; arc=none smtp.client-ip=209.85.208.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2dde561f852so23195521fa.2; Tue, 23 Apr 2024 18:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713923854; x=1714528654; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=ozl4eR2gI7UeFBtqjfRipXEMqkSU7RXdrGoXvouiIDU=; b=XAujAL+qZy2nBYSt1HKw4D1V1r2zRlV1TI30ij1qSp7D2U24kQ3Pi314lPbOdoTsna ew16lEbfKSDCV6hwPfOK2DCT8B0hj572+Vh8+fTTRkgJaQREVkN8MvHiNrf9NX+lpGM2 7D9Zg2pJ+yELjXcWL3JZpV+rYE7KL6SURqbYVFCIj2fOf8DikmasfdPpqkt+G1HC1ZPt kUTwFENKC13WIRVx8cwdVyiJVgumOWVstItcv0WP/zvy7Kmena8/xV4eFlgE8iqN+nFt 2+8UZp42mm42h+w5JXfYhPiL7DU/uw/Se3Yu70kMZV8HPpbBD61j+a+3aQlaDzCb0KSJ cnig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713923854; x=1714528654; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ozl4eR2gI7UeFBtqjfRipXEMqkSU7RXdrGoXvouiIDU=; b=AH7dKDKI0Q4vLtRNrHjLfWi1PVJCuPVdzIDHckYsAdDbb1+GPn0LZD2Vtn/63e21D1 0ldpiB+BkofGiPTxtuBYebhHYEBnG5sEkhqp7BMOt4+q8HykV4cign3J0e6EyuIVh8lc GtA0ArTtBW6V5X+KI5777rQiQEWRRooSHb4fGWBUSN9SNl7506MBpKV1lsWGB+4Z+Uf0 1KFLDUFf9MaQrtXj4r5/e/n3olBpq+LN07BZU3RcOHWYOptEWLYF1IoVUxfWdMVy0Hx5 fC6Tn6G9RgcsafChh+0H/ha7vSDwXJ8/tqwvHArtbGyLXGqrewqcPLaEvG23tn06ncEX /i9g== X-Forwarded-Encrypted: i=1; AJvYcCVMTiw/GVDUT+LtTlihmkoZMp2WkY4DrJX7HYQmZKR3z4NXdhOiQlQuzeQShJjIL94gP5lYzqFhSDvjaqMRit5ZBkzYmRY7cqySLzS/Ut8Lcpgt3lrSWjO7S60qXQHT/b4m4+BdwSDVVwInMkACMfEQd7z01kewvTDa6/2NlI1mlabKrxKW030E X-Gm-Message-State: AOJu0Ywh1n/pFHoH4LW7BldgsrNm4vHSXxcvMOxJ9K37CggqECe5GXm1 ZqKdk/901tkXGmKzVmc2FQFJ0Z7u/la+YvVQ08++rAHerbdhIDtVZ13xpDBSSA4jHqqt+BMKUpg VfGcRKMxAxd9s87qYZrDJj6npyYg= X-Received: by 2002:a2e:b018:0:b0:2dc:de74:dfd6 with SMTP id y24-20020a2eb018000000b002dcde74dfd6mr501225ljk.10.1713923853805; Tue, 23 Apr 2024 18:57:33 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240423170339.54131-1-ryncsn@gmail.com> <20240423170339.54131-3-ryncsn@gmail.com> In-Reply-To: From: Kairui Song Date: Wed, 24 Apr 2024 09:57:15 +0800 Message-ID: Subject: Re: [PATCH v2 2/8] nilfs2: drop usage of page_index To: Ryusuke Konishi Cc: Matthew Wilcox , linux-mm@kvack.org, Andrew Morton , "Huang, Ying" , 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, linux-nilfs@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Apr 24, 2024 at 2:51=E2=80=AFAM Ryusuke Konishi wrote: > > On Wed, Apr 24, 2024 at 2:04=E2=80=AFAM Kairui Song wrote: > > > > From: Kairui Song > > > > page_index is only 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 (being part of buffer head), > > so just drop it, also convert it to use folio. > > > > Signed-off-by: Kairui Song > > Cc: Ryusuke Konishi > > Cc: linux-nilfs@vger.kernel.org > > --- > > fs/nilfs2/bmap.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c > > index 383f0afa2cea..9f561afe864f 100644 > > --- a/fs/nilfs2/bmap.c > > +++ b/fs/nilfs2/bmap.c > > @@ -453,8 +453,7 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bm= ap *bmap, > > struct buffer_head *pbh; > > __u64 key; > > > > - key =3D page_index(bh->b_page) << (PAGE_SHIFT - > > - bmap->b_inode->i_blkbits); > > + key =3D bh->b_folio->index << (PAGE_SHIFT - bmap->b_inode->i_bl= kbits); > > for (pbh =3D page_buffers(bh->b_page); pbh !=3D bh; pbh =3D pbh= ->b_this_page) > > key++; > > This conversion mixes the use of page and folio within the function. > Would you like to take the opportunity to convert > "page_buffers(bh->b_page)" to "folio_buffers(bh->b_folio)" as well? OK, will update this part.