ide: remove ide_drive_t.usage

This field is no longer used by the core IDE code so fix ide-{disk,floppy}
drivers to keep openers count in the driver specific objects and remove
it from ide-{cd,scsi,tape} drivers (it was write-only).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 07fa37d84df2..61969415c57b 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -279,6 +279,7 @@ typedef struct ide_floppy_obj {
         ide_driver_t    *driver;
         struct gendisk  *disk;
         struct kref     kref;
+        unsigned int    openers;        /* protected by BKL for now */
 
         /* Current packet command */
         idefloppy_pc_t *pc;
@@ -1950,9 +1951,9 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
 
         drive = floppy->drive;
 
-        drive->usage++;
+        floppy->openers++;
 
-        if (drive->usage == 1) {
+        if (floppy->openers == 1) {
                 clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
                 /* Just in case */
 
@@ -1970,13 +1971,11 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                     ** capacity of the drive or begin the format - Sam
                     */
                     ) {
-                        drive->usage--;
                         ret = -EIO;
                         goto out_put_floppy;
                 }
 
                 if (floppy->wp && (filp->f_mode & 2)) {
-                        drive->usage--;
                         ret = -EROFS;
                         goto out_put_floppy;
                 }
@@ -1988,13 +1987,13 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                 }
                 check_disk_change(inode->i_bdev);
         } else if (test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags)) {
-                drive->usage--;
                 ret = -EBUSY;
                 goto out_put_floppy;
         }
         return 0;
 
 out_put_floppy:
+        floppy->openers--;
         ide_floppy_put(floppy);
         return ret;
 }
@@ -2008,7 +2007,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
         
         debug_log(KERN_INFO "Reached idefloppy_release\n");
 
-        if (drive->usage == 1) {
+        if (floppy->openers == 1) {
                 /* IOMEGA Clik! drives do not support lock/unlock commands */
                 if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) {
                         idefloppy_create_prevent_cmd(&pc, 0);
@@ -2017,7 +2016,8 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
 
                 clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
         }
-        drive->usage--;
+
+        floppy->openers--;
 
         ide_floppy_put(floppy);
 
@@ -2051,7 +2051,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
                 prevent = 0;
                 /* fall through */
         case CDROM_LOCKDOOR:
-                if (drive->usage > 1)
+                if (floppy->openers > 1)
                         return -EBUSY;
 
                 /* The IOMEGA Clik! Drive doesn't support this command - no room for an eject mechanism */
@@ -2073,7 +2073,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
                 if (!(file->f_mode & 2))
                         return -EPERM;
 
-                if (drive->usage > 1) {
+                if (floppy->openers > 1) {
                         /* Don't format if someone is using the disk */
 
                         clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS,