From 9f08357fd362d675d5dd414fc5bd01c0b64658ab Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 23 Nov 2005 13:37:36 -0800
Subject: [PATCH] --- yaml --- r: 14642 b: refs/heads/master c:
 c101e77301877086e6f977fcfb140d1cbbe23fd5 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/block/floppy.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2c5a73ba74ce..ed7f556bdf3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2b5a251b9feca727661f1a3278cafb1de4c80f3
+refs/heads/master: c101e77301877086e6f977fcfb140d1cbbe23fd5
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 13b8a9bed66e..f7e765a1d313 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/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;