From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alasdair G Kergon <agk@redhat•com>, Mike Snitzer <snitzer@redhat•com>
Cc: Christoph Hellwig <hch@lst•de>, Hannes Reinecke <hare@suse•de>,
Jens Axboe <axboe@kernel•dk>,
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 device-mapper tree with Linus' tree
Date: Tue, 22 Dec 2020 09:50:56 +1100 [thread overview]
Message-ID: <20201222095056.7a5ac0a0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]
Hi all,
Today's linux-next merge of the device-mapper tree got a conflict in:
drivers/md/dm-table.c
between commit:
4e7b5671c6a8 ("block: remove i_bdev")
from Linus' tree and commit:
05a876e9a2a8 ("dm table: avoid filesystem lookup in dm_get_dev_t()")
from the device-mapper 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 drivers/md/dm-table.c
index 188f41287f18,299a256fb409..000000000000
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@@ -347,9 -347,22 +347,15 @@@ static int upgrade_mode(struct dm_dev_i
dev_t dm_get_dev_t(const char *path)
{
dev_t dev;
- struct block_device *bdev;
+ unsigned int maj, min;
+ if (sscanf(path, "%u:%u", &maj, &min) == 2) {
+ dev = MKDEV(maj, min);
+ if (maj == MAJOR(dev) && min == MINOR(dev))
+ return dev;
+ }
- bdev = lookup_bdev(path);
- if (IS_ERR(bdev))
+ if (lookup_bdev(path, &dev))
dev = name_to_dev_t(path);
- else {
- dev = bdev->bd_dev;
- bdput(bdev);
- }
-
return dev;
}
EXPORT_SYMBOL_GPL(dm_get_dev_t);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-12-21 22:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 22:50 Stephen Rothwell [this message]
2020-12-22 13:15 ` linux-next: manual merge of the device-mapper tree with Linus' tree Christoph Hellwig
2020-12-22 14:53 ` DM's filesystem lookup in dm_get_dev_t() [was: Re: linux-next: manual merge of the device-mapper tree with Linus' tree] Mike Snitzer
2020-12-22 17:24 ` Hannes Reinecke
2020-12-23 8:05 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2022-03-29 22:53 linux-next: manual merge of the device-mapper tree with Linus' tree Stephen Rothwell
2013-03-04 0:36 Stephen Rothwell
2009-10-05 3:41 Stephen Rothwell
2009-10-05 15:40 ` Jiri Slaby
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=20201222095056.7a5ac0a0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agk@redhat$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=hare@suse$(echo .)de \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=snitzer@redhat$(echo .)com \
/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