* linux-next: manual merge of the bdev tree
@ 2008-09-18 6:11 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2008-09-18 6:11 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Mikulas Patocka, Alasdair G Kergon
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];
};
^ permalink raw reply related [flat|nested] 9+ messages in thread
* linux-next: manual merge of the bdev tree
@ 2008-09-18 6:23 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2008-09-18 6:23 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Mikulas Patocka, Alasdair G Kergon
Hi Al,
Today's linux-next merge of the bdev tree got a conflict in
drivers/md/dm-table.c between commit
12aba00642892cc565093c57be41693c7810e540 ("dm-export-struct-dm_dev") from
the device-mapper tree and "[PATCH] pass fmode_t to blkdev_put()" from
the bdev tree.
You will need to rebase the tree, I am afraid ... I removed it all for
today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the bdev tree
@ 2008-10-16 8:48 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2008-10-16 8:48 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
Hi Al,
I tried to merge the bdev tree, but even the first commit had conflicts
so I have dropped it for today. Given that it is based on next-20080919
and there has been a lot of changes since then, I was not hopeful. :-(
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the bdev tree
@ 2008-10-17 7:29 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2008-10-17 7:29 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Bartlomiej Zolnierkiewicz
Hi Al,
Today's linux-next merge of the bdev tree got a conflict in
drivers/ide/ide-floppy.c between commit idefloppy_open ("ide-floppy:
factor out generic disk handling code to ide-gd-floppy.c") from the ide
tree and commit 30819ee65ed2e69fab5d5986ae0177795615a7fc ("[PATCH]
introduce fmode_t, do annotations") from the bdev tree.
The former moved the code that the latter modified. You no longer need
to patch drivers/ide/ide-floppy.c - I think you need to patch
drivers/ide/ide-gd.c instead. I added the patch below.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index d44898f..5e5090a 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -7,6 +7,7 @@
#include <linux/mutex.h>
#include <linux/ide.h>
#include <linux/hdreg.h>
+#include <linux/fs.h>
#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
#define IDE_DISK_MINORS (1 << PARTN_BITS)
@@ -202,7 +203,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp)
goto out_put_idkp;
}
- if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & 2)) {
+ if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & FMODE_WRITE)) {
ret = -EROFS;
goto out_put_idkp;
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* linux-next: manual merge of the bdev tree
@ 2008-10-17 7:35 Stephen Rothwell
2008-10-17 7:42 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-10-17 7:35 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Bartlomiej Zolnierkiewicz
Hi Al,
Today's linux-next merge of the bdev tree got a conflict in
drivers/ide/ide-floppy.c between commits from the ide tree and commit
a55897a7d06734d1ae32124a5e19cb903c33b8e3 ("[PATCH] eliminate use of
->f_flags in block methods") from the bdev tree.
Again you don't need to patch drivers/ide/ide-floppy.c any more, but
drivers/ide/ide-gd.c instead. Patch below.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 5e5090a..c4f31de 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -198,7 +198,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp)
* unreadable disk, so that we can get the format capacity
* of the drive or begin the format - Sam
*/
- if (ret && (filp->f_flags & O_NDELAY) == 0) {
+ if (ret && (filp->f_mode & FMODE_NDELAY) == 0) {
ret = -EIO;
goto out_put_idkp;
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the bdev tree
2008-10-17 7:35 linux-next: manual merge of the bdev tree Stephen Rothwell
@ 2008-10-17 7:42 ` Stephen Rothwell
2008-10-17 8:58 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-10-17 7:42 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Bartlomiej Zolnierkiewicz
[-- Attachment #1: Type: text/plain, Size: 667 bytes --]
Hi Al,
On Fri, 17 Oct 2008 18:35:57 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the bdev tree got a conflict in
> drivers/ide/ide-floppy.c between commits from the ide tree and commit
> a55897a7d06734d1ae32124a5e19cb903c33b8e3 ("[PATCH] eliminate use of
> ->f_flags in block methods") from the bdev tree.
>
> Again you don't need to patch drivers/ide/ide-floppy.c any more, but
> drivers/ide/ide-gd.c instead. Patch below.
I got a bit harder after that ... so I have again dropped the bdev for
today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the bdev tree
2008-10-17 7:42 ` Stephen Rothwell
@ 2008-10-17 8:58 ` Bartlomiej Zolnierkiewicz
2008-10-17 11:14 ` Al Viro
0 siblings, 1 reply; 9+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-10-17 8:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Al Viro, linux-next
On Fri, Oct 17, 2008 at 9:42 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Al,
>
> On Fri, 17 Oct 2008 18:35:57 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>
>> Today's linux-next merge of the bdev tree got a conflict in
>> drivers/ide/ide-floppy.c between commits from the ide tree and commit
>> a55897a7d06734d1ae32124a5e19cb903c33b8e3 ("[PATCH] eliminate use of
>> ->f_flags in block methods") from the bdev tree.
>>
>> Again you don't need to patch drivers/ide/ide-floppy.c any more, but
>> drivers/ide/ide-gd.c instead. Patch below.
Yes, the common ide-{disk,floppy}.c code resides now in ide-gd.c.
> I got a bit harder after that ... so I have again dropped the bdev for
> today.
This may be actually my fault since I remember Al asking me about some
conflicting
changes during KS/LPC? (though I later forgot about it).
Al, is stuff in bdev-next going in during this merge window? If so
please push it
to Linus ASAP and I'll take care of fixing IDE patches. Otherwise I'm
going to push
IDE stuff to Linus and you'll have to fixup bdev-next. ;-)
Thanks,
Bart
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the bdev tree
2008-10-17 8:58 ` Bartlomiej Zolnierkiewicz
@ 2008-10-17 11:14 ` Al Viro
2008-10-17 13:24 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 9+ messages in thread
From: Al Viro @ 2008-10-17 11:14 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Stephen Rothwell, linux-next
On Fri, Oct 17, 2008 at 10:58:42AM +0200, Bartlomiej Zolnierkiewicz wrote:
> Yes, the common ide-{disk,floppy}.c code resides now in ide-gd.c.
>
> > I got a bit harder after that ... so I have again dropped the bdev for
> > today.
>
> This may be actually my fault since I remember Al asking me about some
> conflicting
> changes during KS/LPC? (though I later forgot about it).
>
> Al, is stuff in bdev-next going in during this merge window? If so
> please push it
> to Linus ASAP and I'll take care of fixing IDE patches. Otherwise I'm
> going to push
> IDE stuff to Linus and you'll have to fixup bdev-next. ;-)
As the matter of fact, I've got bdev-next variant covering ide-gd, so
if you can push the relevant ide patch(es) to Linus, bdev would be ready
to go. Or I can push the mainline-based variant and send the pieces
that affect ide-gd your way (basically, it's a matter of f_mode/f_flags
stuff being touched in ide-gd instead of ide-floppy, converting your
disk_ops->ioctl() to sane prototype and converting ide-gd.c to new
bdev method prototypes). Up to you...
Al, trying to order the VFS patch-pile into mergable shape right now...
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the bdev tree
2008-10-17 11:14 ` Al Viro
@ 2008-10-17 13:24 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 9+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-10-17 13:24 UTC (permalink / raw)
To: Al Viro; +Cc: Stephen Rothwell, linux-next
On Fri, Oct 17, 2008 at 1:14 PM, Al Viro <viro@zeniv•linux.org.uk> wrote:
> On Fri, Oct 17, 2008 at 10:58:42AM +0200, Bartlomiej Zolnierkiewicz wrote:
>
>> Yes, the common ide-{disk,floppy}.c code resides now in ide-gd.c.
>>
>> > I got a bit harder after that ... so I have again dropped the bdev for
>> > today.
>>
>> This may be actually my fault since I remember Al asking me about some
>> conflicting
>> changes during KS/LPC? (though I later forgot about it).
>>
>> Al, is stuff in bdev-next going in during this merge window? If so
>> please push it
>> to Linus ASAP and I'll take care of fixing IDE patches. Otherwise I'm
>> going to push
>> IDE stuff to Linus and you'll have to fixup bdev-next. ;-)
>
> As the matter of fact, I've got bdev-next variant covering ide-gd, so
> if you can push the relevant ide patch(es) to Linus, bdev would be ready
Great! Thanks for taking care of it.
> to go. Or I can push the mainline-based variant and send the pieces
>
> that affect ide-gd your way (basically, it's a matter of f_mode/f_flags
> stuff being touched in ide-gd instead of ide-floppy, converting your
> disk_ops->ioctl() to sane prototype and converting ide-gd.c to new
> bdev method prototypes). Up to you...
I prefer to push IDE changes first...
[ I'll send another pull request to Linus later today. ]
Bart
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2008-10-17 13:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-17 7:35 linux-next: manual merge of the bdev tree 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
-- strict thread matches above, loose matches on Subject: below --
2008-10-17 7:29 Stephen Rothwell
2008-10-16 8:48 Stephen Rothwell
2008-09-18 6:23 Stephen Rothwell
2008-09-18 6:11 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox