From nobody Mon Jun 22 23:56:38 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C8A0C433EF for ; Tue, 15 Mar 2022 09:31:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346624AbiCOJcd (ORCPT ); Tue, 15 Mar 2022 05:32:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244353AbiCOJcb (ORCPT ); Tue, 15 Mar 2022 05:32:31 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1128D4ECCC; Tue, 15 Mar 2022 02:31:18 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4KHp7P58N5z4xNm; Tue, 15 Mar 2022 20:31:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647336676; bh=nMU9jrGSvbigdoyqQvgfktQ0ZN+1Bv9BixnK+MzkewY=; h=Date:From:To:Cc:Subject:From; b=abq96raPbem8Sql29ZOP5HdVjLIguzoQQLdi/psLuLK828JPhygHn0On62KKWbrvg HbEiTtb0W8znkrf8jVXqxjpcmjjC6FKftj/bns5FX4TAiane2cPfrmLtztkyBR/95h fjnxbwdzB3P4saF/WCF00fWV0bQyXoYaVIFtLAEINPOsTtlT4XDjtMKUifQ+QKuSfY bM4OXw0B0MUtqqDIhfzXg74a+nKDVTOjUz9sDmR3wROxwFqHCUEhyh+5L7D1lajJtA eqAob2N/3DinFiA0VlimmEjZ5V02gjsM1yMrxY7LNMUPlatVqDqU2VV3s83BNjisZL pDmCZ39Juuaqg== Date: Tue, 15 Mar 2022 20:31:12 +1100 From: Stephen Rothwell To: Matthew Wilcox , Gao Xiang Cc: Gao Xiang , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the folio tree with the erofs tree Message-ID: <20220315203112.03f6120c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/8TvW=Ep3q0FYicWp5oUaKff"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/8TvW=Ep3q0FYicWp5oUaKff Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the folio tree got a conflict in: fs/erofs/super.c between commit: ab6bfa6e1e22 ("erofs: refine managed inode stuffs") from the erofs tree and commit: 8c5b1ba024af ("erofs: Convert from invalidatepage to invalidate_folio") from the folio tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc fs/erofs/super.c index e178100c162a,a64c422f6763..000000000000 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@@ -532,24 -535,18 +532,23 @@@ static int erofs_managed_cache_releasep return ret; } =20 +/* + * It will be called only on inode eviction. In case that there are still= some + * decompression requests in progress, wait with rescheduling for a bit h= ere. + * We could introduce an extra locking instead but it seems unnecessary. + */ - static void erofs_managed_cache_invalidatepage(struct page *page, - unsigned int offset, - unsigned int length) + static void erofs_managed_cache_invalidate_folio(struct folio *folio, + size_t offset, size_t length) { - const unsigned int stop =3D length + offset; + const size_t stop =3D length + offset; =20 - DBG_BUGON(!PageLocked(page)); + DBG_BUGON(!folio_test_locked(folio)); =20 /* Check for potential overflow in debug mode */ - DBG_BUGON(stop > PAGE_SIZE || stop < length); + DBG_BUGON(stop > folio_size(folio) || stop < length); =20 - if (offset =3D=3D 0 && stop =3D=3D PAGE_SIZE) - while (!erofs_managed_cache_releasepage(page, GFP_NOFS)) + if (offset =3D=3D 0 && stop =3D=3D folio_size(folio)) + while (!erofs_managed_cache_releasepage(&folio->page, GFP_NOFS)) cond_resched(); } =20 --Sig_/8TvW=Ep3q0FYicWp5oUaKff Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIwXOAACgkQAVBC80lX 0GyavQgApdlRqmDQPKHTmYvvnVpaeBZEDQfjZXDJFVtnieJr1vws9bf/O6EGzMWC DZxRQcrQk4K7ymcIoWJQL3fHqrL0cRaCbyrh17VljPt/HgkbiAJ3jZTK/HpbQAVC 03vH33lvFWEpfFYpaP8ZW5fbttFzamOJFS8IdwKZUbFCJA45P0zTtKhdaJsOF1uh +xZFORYHzd81Uy49OM6IgPxwhpcAeyArvJ18mSx/eTb1bZ/90YC/79d4XqxSTTiJ 2g3PKPBFNvxX2njqnsDya7yghnueZX4+3D874L5CjvLce/opvzYoiqb3klfyyLMl EVsJow0f2ePc0DZmi9q3SJkQG/h8zg== =O6m0 -----END PGP SIGNATURE----- --Sig_/8TvW=Ep3q0FYicWp5oUaKff--