diff options
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r-- | drivers/block/floppy.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 28002de783b6..f7e765a1d313 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -98,6 +98,10 @@ | |||
98 | */ | 98 | */ |
99 | 99 | ||
100 | /* | 100 | /* |
101 | * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support | ||
102 | */ | ||
103 | |||
104 | /* | ||
101 | * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of | 105 | * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of |
102 | * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting & | 106 | * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting & |
103 | * use of '0' for NULL. | 107 | * use of '0' for NULL. |
@@ -158,10 +162,6 @@ static int print_unex = 1; | |||
158 | #define FDPATCHES | 162 | #define FDPATCHES |
159 | #include <linux/fdreg.h> | 163 | #include <linux/fdreg.h> |
160 | 164 | ||
161 | /* | ||
162 | * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support | ||
163 | */ | ||
164 | |||
165 | #include <linux/fd.h> | 165 | #include <linux/fd.h> |
166 | #include <linux/hdreg.h> | 166 | #include <linux/hdreg.h> |
167 | 167 | ||
@@ -3714,12 +3714,6 @@ static int floppy_open(struct inode *inode, struct file *filp) | |||
3714 | USETF(FD_VERIFY); | 3714 | USETF(FD_VERIFY); |
3715 | } | 3715 | } |
3716 | 3716 | ||
3717 | /* set underlying gendisk policy to reflect real ro/rw status */ | ||
3718 | if (UTESTF(FD_DISK_WRITABLE)) | ||
3719 | inode->i_bdev->bd_disk->policy = 0; | ||
3720 | else | ||
3721 | inode->i_bdev->bd_disk->policy = 1; | ||
3722 | |||
3723 | if (UDRS->fd_ref == -1 || (UDRS->fd_ref && (filp->f_flags & O_EXCL))) | 3717 | if (UDRS->fd_ref == -1 || (UDRS->fd_ref && (filp->f_flags & O_EXCL))) |
3724 | goto out2; | 3718 | goto out2; |
3725 | 3719 | ||