From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Josef Bacik <josef@toxicpanda.com>,
Nikolay Borisov <nborisov@suse.com>
Subject: linux-next: build failure after merge of the btrfs tree
Date: Thu, 20 Feb 2020 09:23:44 +1100 [thread overview]
Message-ID: <20200220092344.2a738574@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1932 bytes --]
Hi all,
After merging the btrfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/btrfs/extent-tree.c: In function 'btrfs_alloc_logged_file_extent':
fs/btrfs/extent-tree.c:4425:20: error: passing argument 1 of 'btrfs_pin_extent' from incompatible pointer type [-Werror=incompatible-pointer-types]
4425 | btrfs_pin_extent(fs_info, ins->objectid, ins->offset, 1);
| ^~~~~~~
| |
| struct btrfs_fs_info *
fs/btrfs/extent-tree.c:2609:49: note: expected 'struct btrfs_trans_handle *' but argument is of type 'struct btrfs_fs_info *'
2609 | int btrfs_pin_extent(struct btrfs_trans_handle *trans,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
Caused by commit
4e2c2f96e6a3 ("btrfs: Make btrfs_pin_extent take trans handle")
interacting with commit
bd727173e443 ("btrfs: handle logged extent failure properly")
from the btrfs-fixes tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Feb 2020 09:20:33 +1100
Subject: [PATCH] btrfs: fix for btrfs_pin_extent() API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/btrfs/extent-tree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 56ad0a4ff5ba..9dcd70cc3ca3 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4422,7 +4422,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,
ret = alloc_reserved_file_extent(trans, 0, root_objectid, 0, owner,
offset, ins, 1);
if (ret)
- btrfs_pin_extent(fs_info, ins->objectid, ins->offset, 1);
+ btrfs_pin_extent(trans, ins->objectid, ins->offset, 1);
btrfs_put_block_group(block_group);
return ret;
}
--
2.25.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-02-19 22:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 22:23 Stephen Rothwell [this message]
2020-02-21 11:30 ` linux-next: build failure after merge of the btrfs tree David Sterba
2020-02-21 11:33 ` David Sterba
-- strict thread matches above, loose matches on Subject: below --
2023-01-12 23:36 Stephen Rothwell
2023-01-13 10:59 ` David Sterba
2022-11-07 22:42 Stephen Rothwell
2022-11-08 11:21 ` David Sterba
2022-09-06 19:44 Stephen Rothwell
2022-08-21 23:44 Stephen Rothwell
2021-10-27 10:09 Stephen Rothwell
2021-10-29 8:28 ` Stephen Rothwell
2021-10-29 9:52 ` David Sterba
2021-10-29 10:50 ` David Sterba
[not found] ` <CAHp75VdXJEuY86pFC+bLoGbAYuGsA+KqEV-g4Dca25HHD-njHA@mail.gmail.com>
2021-10-29 12:14 ` David Sterba
2021-10-31 4:30 ` Stephen Rothwell
2021-10-08 4:03 Stephen Rothwell
2021-10-08 5:56 ` Qu Wenruo
2020-04-21 0:25 Stephen Rothwell
2020-04-21 0:40 ` Qu Wenruo
2020-04-21 1:13 ` Stephen Rothwell
2020-04-21 1:33 ` Qu Wenruo
2020-04-21 1:55 ` Stephen Rothwell
2020-04-22 21:29 ` David Sterba
2020-04-24 5:17 ` Qu Wenruo
2015-08-21 0:42 Stephen Rothwell
2012-12-16 23:00 Stephen Rothwell
2012-12-17 0:15 ` Chris Mason
2012-12-17 2:52 ` Chris Mason
2012-12-17 3:13 ` Stephen Rothwell
2012-12-17 3:38 ` Chris Mason
2012-12-17 2:01 ` Chris Mason
2012-10-01 4:22 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200220092344.2a738574@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dsterba@suse.cz \
--cc=josef@toxicpanda.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nborisov@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).