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@xxxxxxxxxxxxxxxx
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
