From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: linux-next@vger•kernel.org, Mikulas Patocka <mpatocka@redhat•com>,
Alasdair G Kergon <agk@redhat•com>
Subject: linux-next: manual merge of the bdev tree
Date: Thu, 18 Sep 2008 16:11:21 +1000 [thread overview]
Message-ID: <20080918161121.3c05de97.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the uwb tree got a conflict in
drivers/md/dm-table.c and drivers/md/dm.h between commit
12aba00642892cc565093c57be41693c7810e540 ("dm-export-struct-dm_dev") from
the device-mapper tree and "[PATCH] introduce fmode_t, do annotations"
from the bdev tree.
I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/md/dm-table.c
index f897007,65ac365..0000000
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@@ -382,12 -379,11 +382,12 @@@ static int check_device_area(struct dm_
* careful to leave things as they were if we fail to reopen the
* device.
*/
- static int upgrade_mode(struct dm_dev_internal *dd, int new_mode,
-static int upgrade_mode(struct dm_dev *dd, fmode_t new_mode, struct mapped_device *md)
++static int upgrade_mode(struct dm_dev_internal *dd, fmode_t new_mode,
+ struct mapped_device *md)
{
int r;
- struct dm_dev dd_copy;
- dev_t dev = dd->bdev->bd_dev;
+ struct dm_dev_internal dd_copy;
+ dev_t dev = dd->dm_dev.bdev->bd_dev;
dd_copy = *dd;
diff --cc drivers/md/dm.h
index cd189da,f81ad57..0000000
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 73806ff..3f8d4e7 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -85,7 +85,7 @@ void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev);
struct dm_dev {
struct block_device *bdev;
- int mode;
+ fmode_t mode;
char name[16];
};
next reply other threads:[~2008-09-18 6:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-18 6:11 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-18 6:23 linux-next: manual merge of the bdev tree Stephen Rothwell
2008-10-16 8:48 Stephen Rothwell
2008-10-17 7:29 Stephen Rothwell
2008-10-17 7:35 Stephen Rothwell
2008-10-17 7:42 ` Stephen Rothwell
2008-10-17 8:58 ` Bartlomiej Zolnierkiewicz
2008-10-17 11:14 ` Al Viro
2008-10-17 13:24 ` Bartlomiej Zolnierkiewicz
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=20080918161121.3c05de97.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agk@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpatocka@redhat$(echo .)com \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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