From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>, Jaegeuk Kim <jaegeuk@kernel•org>
Cc: Christoph Hellwig <hch@lst•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the f2fs tree
Date: Tue, 15 Aug 2023 11:30:13 +1000 [thread overview]
Message-ID: <20230815113013.40cbf98a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1715 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/f2fs/super.c
between commit:
51bf8d3c8199 ("f2fs: don't reopen the main block device in f2fs_scan_devices")
from the f2fs tree and commit:
2ea6f68932f7 ("fs: use the super_block as holder when mounting file systems")
from the vfs-brauner 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.
--
Cheers,
Stephen Rothwell
diff --cc fs/f2fs/super.c
index a067466a694c,aa1f9a3a8037..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1561,8 -1561,7 +1561,8 @@@ static void destroy_device_list(struct
int i;
for (i = 0; i < sbi->s_ndevs; i++) {
- blkdev_put(FDEV(i).bdev, sbi->sb);
+ if (i > 0)
- blkdev_put(FDEV(i).bdev, sbi->sb->s_type);
++ blkdev_put(FDEV(i).bdev, sbi->sb);
#ifdef CONFIG_BLK_DEV_ZONED
kvfree(FDEV(i).blkz_seq);
#endif
@@@ -4218,9 -4215,9 +4218,9 @@@ static int f2fs_scan_devices(struct f2f
FDEV(i).end_blk = FDEV(i).start_blk +
(FDEV(i).total_segments <<
sbi->log_blocks_per_seg) - 1;
+ FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path,
- mode, sbi->sb->s_type, NULL);
++ mode, sbi->sb, NULL);
}
- FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path, mode,
- sbi->sb, NULL);
}
if (IS_ERR(FDEV(i).bdev))
return PTR_ERR(FDEV(i).bdev);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-08-15 1:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 1:30 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 1:33 linux-next: manual merge of the vfs-brauner tree with the f2fs tree Stephen Rothwell
2024-02-28 23:41 Stephen Rothwell
2024-02-29 17:13 ` Jaegeuk Kim
2024-03-05 0:35 ` Stephen Rothwell
2024-03-05 0:40 ` Jaegeuk Kim
2024-03-12 4:02 ` Stephen Rothwell
2024-09-01 23:24 Stephen Rothwell
2024-09-05 0:18 ` Stephen Rothwell
2024-09-05 4:00 ` Chao Yu
2024-09-16 22:24 ` Stephen Rothwell
2025-07-13 22:25 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=20230815113013.40cbf98a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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