[PATCH] revert floppy-fix-read-only-handling

This fix causes problems on the very first floppy access - we haven't yet
talked to the FDC so we don't know which state the write-protect tab is in.

Revert for now.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 13b8a9bed66e03652d29f0a5dd9ae8f92a08069d..f7e765a1d313656eae67575a317dd9d24102999e 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3714,12 +3714,6 @@ static int floppy_open(struct inode *inode, struct file *filp)
                USETF(FD_VERIFY);
        }
 
-       /* set underlying gendisk policy to reflect real ro/rw status */
-       if (UTESTF(FD_DISK_WRITABLE))
-               inode->i_bdev->bd_disk->policy = 0;
-       else
-               inode->i_bdev->bd_disk->policy = 1;
-
        if (UDRS->fd_ref == -1 || (UDRS->fd_ref && (filp->f_flags & O_EXCL)))
                goto out2;