From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 309962A1CF for ; Sun, 23 Nov 2025 23:25:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763940335; cv=none; b=OS74S8IYqkVRBoeNy+D8BENq/DxG0NlK5+8Mar02EI6iG0gC5RBXTf094xeAmRBk9UepbhCf4eM717L7O2pl05HrSI5zLhn3UuXmA99E/sAOl9VocPeEwBQ5jH5Kt0E7MWq3UfvA6J5GjuOWql9viWo/y30JKjlX5tTiYBa7C+Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763940335; c=relaxed/simple; bh=erFdT05xcZODndAvhzpnM3jNNUD2ccezHMRzF2RjdCE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=hc1Mt2lDSbmYW32u85/Xq6QAO2v+R8Xn7U2ZKrLTWNcch6ejcIGcUUzyQMx4KIFt3Rd5iZD9XJkfz1+guVDkpX+ufEvyrEgEddqh2+8pSyfNvIYJTpMawB1Cf2BeEBdxzIJ6qcuciOfMNOKqPXrMOFE+DaDSXbvL9uLoDEEX6zs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=WUCGF/5O; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="WUCGF/5O" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-477619f8ae5so20706355e9.3 for ; Sun, 23 Nov 2025 15:25:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1763940330; x=1764545130; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=ndqg3JaTIm7dUnnTrPdnX/z7F0O0uIBf1cc+snhl7LE=; b=WUCGF/5OsfbKK2keteiola+H9r0Zu7tRE+cMaJ05JUdPkPdn+e6pH7na5CdFhRZ9NO WAarFqGrk2bNCpuDASK9ENR5WiSrzJ/CY7d9axiqaBi1Kluo3eCOTyixY0EJJjrTHi+O W7IAmR/XKi0SrZaLNn4WSbysigmgeeZRCbZcrWb+MHu1szkr6T/IhkfCDxoN8UaUCGh6 gwG+WNVoq8cjlD1YXc8792/ftlUA/6H+9xe+Z70S+SeblLQJ6kGRDV6p/ILmm+IIEAmA G8sCgfcR2nOCkCyKB1xskOwLuMpTJZrWkZKaCmryMhoqtO/EICwrhNV9/izqEg1Vqj5k bgRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763940330; x=1764545130; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ndqg3JaTIm7dUnnTrPdnX/z7F0O0uIBf1cc+snhl7LE=; b=SyFhi3x2srHizeH6Vm44KqCDvlVjSHaX/4bm2sLEAbBSXbQmAKzKMM1Es0ja7860t4 TOaTOnhzPIvEjSnRmGlIqCRuwY+S/RBnA8mqyTI5iNyLa+m40+hRCaEH7uSSrbuLJ9aW CRNdqGOgjs/Z2mCHvJGVfM021wtaRz2WRla/ewLWC3aW2O7s/VT92vyPnvsClZIvkE62 adXI+rUdA4wRM1s6X7DX5+MBidYpNMXY4MHiG1UDejo8sdFTkLtMH4zjX/1/stddDMVs J2ILwtiYu05b8SnxnwNGICyAykFqioXVoRyfkmKjTSASb7hTv9gt3i7qgG2eLJi1yltD zGqA== X-Forwarded-Encrypted: i=1; AJvYcCWbhSuas9eGqwiEpnzHDQ8wiOJOslQZriYL8fZKPRCgDPz7NovUt2PvT8/3UzLLpRBjQKZvqVPuMJKTlzw=@vger.kernel.org X-Gm-Message-State: AOJu0Ywu8ki7gazbE/V/rW5jxL/h0KCOr2UXETkLNtnKbl+rZ2+vWsY6 wev9huKNeIplsbTQo6xNExoYLdL5TDb1tX5ceuYzsdBOW77iIkAY0JhJIjUUYOA01xA= X-Gm-Gg: ASbGncsKOUHqSr/Zgfy8JyC8Pdp8A7cmtVRpYpCMwIp7VdQdFdPe7RGK4JnwH/+JGXV M3SpB78/6Eos6UKqRH3f8xwsCWZ2JZjDMR47PCG1qDzUB1pzYfsS8N0GVKf5Th3Z+DTQJp1VfQv NhvSTpjwjX2jw30oPD/bBccjdi4Ez/lgoD92yKbOFFsbvx1d/OSXSu9YT56wNANj4VV6maSx9dJ biKmvvn7k/qf1aAZLrNSL/2T5qigwOBUGnaZsvHAp2ML1le+yVL7GOvvqsBwDJ7cjYNLiNAfyPw 6gMtsY6Es9Mk3ej1oYqJZb3xqri4eegH9IYiQNRgZK4tTltcUZdbcwEY2yM/rLGt+xYS5jZKcVh IF0da7k2qNlZvBBM3NYrPrKq4wdCJyc/dHGId7to21J/1vFBBYLOB4J6iyPu75PQeizfO4mMCW/ aHJFoZij6BPzj6r3zrbr5OE4nc/G2BCaieBjhspZs= X-Google-Smtp-Source: AGHT+IE0py4XhALZLY56cDwRVKNXCWAd0RUYjvx7lUp3XfthiBohVBmKeDdVPEzMaT9ITHBh8uIctQ== X-Received: by 2002:a05:600c:354a:b0:477:97ca:b727 with SMTP id 5b1f17b1804b1-477c01b21bcmr83670485e9.19.1763940330483; Sun, 23 Nov 2025 15:25:30 -0800 (PST) Received: from ?IPV6:2403:580d:fda1::299? (2403-580d-fda1--299.ip6.aussiebb.net. [2403:580d:fda1::299]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-642f71ae71dsm4304148d50.23.2025.11.23.15.25.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Nov 2025 15:25:29 -0800 (PST) Message-ID: <6a94eecb-a729-4b39-8cee-72521d12bd70@suse.com> Date: Mon, 24 Nov 2025 09:55:23 +1030 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: linux-next: manual merge of the vfs_brauner tree with the btrfs tree To: Stephen Rothwell , Christian Brauner , David Sterba Cc: "Matthew Wilcox (Oracle)" , David Sterba , Linux Kernel Mailing List , Linux Next Mailing List References: <20251124100508.64a6974a@canb.auug.org.au> Content-Language: en-US From: Qu Wenruo Autocrypt: addr=wqu@suse.com; keydata= xsBNBFnVga8BCACyhFP3ExcTIuB73jDIBA/vSoYcTyysFQzPvez64TUSCv1SgXEByR7fju3o 8RfaWuHCnkkea5luuTZMqfgTXrun2dqNVYDNOV6RIVrc4YuG20yhC1epnV55fJCThqij0MRL 1NxPKXIlEdHvN0Kov3CtWA+R1iNN0RCeVun7rmOrrjBK573aWC5sgP7YsBOLK79H3tmUtz6b 9Imuj0ZyEsa76Xg9PX9Hn2myKj1hfWGS+5og9Va4hrwQC8ipjXik6NKR5GDV+hOZkktU81G5 gkQtGB9jOAYRs86QG/b7PtIlbd3+pppT0gaS+wvwMs8cuNG+Pu6KO1oC4jgdseFLu7NpABEB AAHNGFF1IFdlbnJ1byA8d3F1QHN1c2UuY29tPsLAlAQTAQgAPgIbAwULCQgHAgYVCAkKCwIE FgIDAQIeAQIXgBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXVgBQkQ/lqxAAoJEMI9kfOh Jf6o+jIH/2KhFmyOw4XWAYbnnijuYqb/obGae8HhcJO2KIGcxbsinK+KQFTSZnkFxnbsQ+VY fvtWBHGt8WfHcNmfjdejmy9si2jyy8smQV2jiB60a8iqQXGmsrkuR+AM2V360oEbMF3gVvim 2VSX2IiW9KERuhifjseNV1HLk0SHw5NnXiWh1THTqtvFFY+CwnLN2GqiMaSLF6gATW05/sEd V17MdI1z4+WSk7D57FlLjp50F3ow2WJtXwG8yG8d6S40dytZpH9iFuk12Sbg7lrtQxPPOIEU rpmZLfCNJJoZj603613w/M8EiZw6MohzikTWcFc55RLYJPBWQ+9puZtx1DopW2jOwE0EWdWB rwEIAKpT62HgSzL9zwGe+WIUCMB+nOEjXAfvoUPUwk+YCEDcOdfkkM5FyBoJs8TCEuPXGXBO Cl5P5B8OYYnkHkGWutAVlUTV8KESOIm/KJIA7jJA+Ss9VhMjtePfgWexw+P8itFRSRrrwyUf E+0WcAevblUi45LjWWZgpg3A80tHP0iToOZ5MbdYk7YFBE29cDSleskfV80ZKxFv6koQocq0 vXzTfHvXNDELAuH7Ms/WJcdUzmPyBf3Oq6mKBBH8J6XZc9LjjNZwNbyvsHSrV5bgmu/THX2n g/3be+iqf6OggCiy3I1NSMJ5KtR0q2H2Nx2Vqb1fYPOID8McMV9Ll6rh8S8AEQEAAcLAfAQY AQgAJgIbDBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXWBBQkQ/lrSAAoJEMI9kfOhJf6o cakH+QHwDszsoYvmrNq36MFGgvAHRjdlrHRBa4A1V1kzd4kOUokongcrOOgHY9yfglcvZqlJ qfa4l+1oxs1BvCi29psteQTtw+memmcGruKi+YHD7793zNCMtAtYidDmQ2pWaLfqSaryjlzR /3tBWMyvIeWZKURnZbBzWRREB7iWxEbZ014B3gICqZPDRwwitHpH8Om3eZr7ygZck6bBa4MU o1XgbZcspyCGqu1xF/bMAY2iCDcq6ULKQceuKkbeQ8qxvt9hVxJC2W3lHq8dlK1pkHPDg9wO JoAXek8MF37R8gpLoGWl41FIUb3hFiu3zhDDvslYM4BmzI18QgQTQnotJH8= In-Reply-To: <20251124100508.64a6974a@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 在 2025/11/24 09:35, Stephen Rothwell 写道: > Hi all, > > After merging the vfs-brauner tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > In file included from include/linux/bits.h:30, > from include/linux/gfp_types.h:5, > from include/linux/gfp.h:5, > from include/linux/slab.h:16, > from fs/btrfs/ordered-data.c:6: > fs/btrfs/ordered-data.c: In function 'btrfs_mark_ordered_io_truncated': > fs/btrfs/ordered-data.c:561:37: error: implicit declaration of function 'folio_end'; did you mean 'folio_nid'? [-Wimplicit-function-declaration] > 561 | ASSERT(file_offset + len <= folio_end(folio)); > | ^~~~~~~~~ > include/linux/build_bug.h:30:63: note: in definition of macro 'BUILD_BUG_ON_INVALID' > 30 | #define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e)))) > | ^ > fs/btrfs/ordered-data.c:561:9: note: in expansion of macro 'ASSERT' > 561 | ASSERT(file_offset + len <= folio_end(folio)); > | ^~~~~~ > In file included from include/linux/bits.h:30, > from include/linux/bitops.h:6, > from fs/btrfs/extent_io.c:3: > fs/btrfs/extent_io.c: In function 'submit_range': > fs/btrfs/extent_io.c:1621:31: error: implicit declaration of function 'folio_end'; did you mean 'folio_nid'? [-Wimplicit-function-declaration] > 1621 | ASSERT(start + len <= folio_end(folio)); > | ^~~~~~~~~ > include/linux/build_bug.h:30:63: note: in definition of macro 'BUILD_BUG_ON_INVALID' > 30 | #define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e)))) > | ^ > fs/btrfs/extent_io.c:1621:9: note: in expansion of macro 'ASSERT' > 1621 | ASSERT(start + len <= folio_end(folio)); > | ^~~~~~ > > Caused by commit > > 48f3784b17d9 ("btrfs: Use folio_next_pos()") > > interatcing with commits > > 98dad9ca0426 ("btrfs: reduce extent map lookup during writes") > c7459b067d9d ("btrfs: make sure all ordered extents beyond EOF is properly truncated") > > from the btrfs tree. > > I applied the following merge fix patch. Thanks for fixing that. Although that two patches from btrfs tree is now retracted for other reasons. I'll refresh the involved patches in the next cycle when btrfs all migrate to folio_next_pos(). Thanks, Qu > > From: Stephen Rothwell > Date: Mon, 24 Nov 2025 09:51:32 +1100 > Subject: [PATCH] fix up for "btrfs: Use folio_next_pos()" > > interacting with commits > > 98dad9ca0426 ("btrfs: reduce extent map lookup during writes") > c7459b067d9d ("btrfs: make sure all ordered extents beyond EOF is properly truncated") > > from the btrfs tree. > > Signed-off-by: Stephen Rothwell > --- > fs/btrfs/extent_io.c | 2 +- > fs/btrfs/ordered-data.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index 995439dff185..3e4056dd8b55 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -1618,7 +1618,7 @@ static int submit_range(struct btrfs_inode *inode, struct folio *folio, > > ASSERT(IS_ALIGNED(start, sectorsize)); > ASSERT(IS_ALIGNED(len, sectorsize)); > - ASSERT(start + len <= folio_end(folio)); > + ASSERT(start + len <= folio_next_pos(folio)); > > while (cur < start + len) { > struct extent_map *em; > diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c > index 51c0a910ea81..731032b40821 100644 > --- a/fs/btrfs/ordered-data.c > +++ b/fs/btrfs/ordered-data.c > @@ -558,7 +558,7 @@ void btrfs_mark_ordered_io_truncated(struct btrfs_inode *inode, struct folio *fo > u64 cur = file_offset; > > ASSERT(file_offset >= folio_pos(folio)); > - ASSERT(file_offset + len <= folio_end(folio)); > + ASSERT(file_offset + len <= folio_next_pos(folio)); > > while (cur < file_offset + len) { > u32 cur_len = file_offset + len - cur;