4 files changed, 36 insertions, 58 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index f82ddfb9a44e..c647a40c0d33 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -162,6 +162,21 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,
 }
 EXPORT_SYMBOL_GPL(ide_queue_pc_tail);
 
+int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on)
+{
+        struct ide_atapi_pc pc;
+
+        if (drive->atapi_flags & IDE_AFLAG_NO_DOORLOCK)
+                return 0;
+
+        ide_init_pc(&pc);
+        pc.c[0] = ALLOW_MEDIUM_REMOVAL;
+        pc.c[4] = on;
+
+        return ide_queue_pc_tail(drive, disk, &pc);
+}
+EXPORT_SYMBOL_GPL(ide_set_media_lock);
+
 /* TODO: unify the code thus making some arguments go away */
 ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
         ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry,
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index ca12a230d9a6..f39cf404b030 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -325,15 +325,6 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
                             IDEFLOPPY_WAIT_CMD, NULL);
 }
 
-static void idefloppy_create_prevent_cmd(struct ide_atapi_pc *pc, int prevent)
-{
-        debug_log("creating prevent removal command, prevent = %d\n", prevent);
-
-        ide_init_pc(pc);
-        pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;
-        pc->c[4] = prevent;
-}
-
 void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)
 {
         ide_init_pc(pc);
@@ -712,6 +703,8 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
         if (strncmp((char *)&id[ATA_ID_PROD], "IOMEGA Clik!", 11) == 0) {
                 blk_queue_max_sectors(drive->queue, 64);
                 drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE;
+                /* IOMEGA Clik! drives do not support lock/unlock commands */
+                drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
         }
 
         (void) ide_floppy_get_capacity(drive);
@@ -782,18 +775,6 @@ static ide_driver_t idefloppy_driver = {
 #endif
 };
 
-static void ide_floppy_set_media_lock(ide_drive_t *drive, int on)
-{
-        struct ide_floppy_obj *floppy = drive->driver_data;
-        struct ide_atapi_pc pc;
-
-        /* IOMEGA Clik! drives do not support lock/unlock commands */
-        if ((drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE) == 0) {
-                idefloppy_create_prevent_cmd(&pc, on);
-                (void)ide_queue_pc_tail(drive, floppy->disk, &pc);
-        }
-}
-
 static int idefloppy_open(struct inode *inode, struct file *filp)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
@@ -842,7 +823,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                 }
 
                 drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED;
-                ide_floppy_set_media_lock(drive, 1);
+                ide_set_media_lock(drive, disk, 1);
                 check_disk_change(inode->i_bdev);
         } else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) {
                 ret = -EBUSY;
@@ -865,7 +846,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
         debug_log("Reached %s\n", __func__);
 
         if (floppy->openers == 1) {
-                ide_floppy_set_media_lock(drive, 0);
+                ide_set_media_lock(drive, disk, 0);
                 drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
         }
 
@@ -891,16 +872,17 @@ static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
                                unsigned long arg, unsigned int cmd)
 {
         idefloppy_floppy_t *floppy = drive->driver_data;
+        struct gendisk *disk = floppy->disk;
         int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0;
 
         if (floppy->openers > 1)
                 return -EBUSY;
 
-        ide_floppy_set_media_lock(drive, prevent);
+        ide_set_media_lock(drive, disk, prevent);
 
         if (cmd == CDROMEJECT) {
                 idefloppy_create_start_stop_cmd(pc, 2);
-                (void)ide_queue_pc_tail(drive, floppy->disk, pc);
+                (void)ide_queue_pc_tail(drive, disk, pc);
         }
 
         return 0;
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 88cb94554267..b7f3eebc0d15 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1214,32 +1214,6 @@ static void idetape_create_locate_cmd(ide_drive_t *drive,
         pc->flags |= PC_FLAG_WAIT_FOR_DSC;
 }
 
-static int idetape_create_prevent_cmd(ide_drive_t *drive,
-                struct ide_atapi_pc *pc, int prevent)
-{
-        idetape_tape_t *tape = drive->driver_data;
-
-        /* device supports locking according to capabilities page */
-        if (!(tape->caps[6] & 0x01))
-                return 0;
-
-        ide_init_pc(pc);
-        pc->c[0] = ALLOW_MEDIUM_REMOVAL;
-        pc->c[4] = prevent;
-        return 1;
-}
-
-static int ide_tape_set_media_lock(ide_drive_t *drive, int on)
-{
-        struct ide_tape_obj *tape = drive->driver_data;
-        struct ide_atapi_pc pc;
-
-        if (!idetape_create_prevent_cmd(drive, &pc, on))
-                return 0;
-
-        return ide_queue_pc_tail(drive, tape->disk, &pc);
-}
-
 static void __ide_tape_discard_merge_buffer(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
@@ -1872,7 +1846,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
                  * attempting to eject.
                  */
                 if (tape->door_locked) {
-                        if (!ide_tape_set_media_lock(drive, 0))
+                        if (!ide_set_media_lock(drive, disk, 0))
                                 tape->door_locked = DOOR_UNLOCKED;
                 }
                 ide_tape_discard_merge_buffer(drive, 0);
@@ -1917,13 +1891,13 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
         case MTFSR:
         case MTBSR:
         case MTLOCK:
-                retval = ide_tape_set_media_lock(drive, 1);
+                retval = ide_set_media_lock(drive, disk, 1);
                 if (retval)
                         return retval;
                 tape->door_locked = DOOR_EXPLICITLY_LOCKED;
                 return 0;
         case MTUNLOCK:
-                retval = ide_tape_set_media_lock(drive, 0);
+                retval = ide_set_media_lock(drive, disk, 0);
                 if (retval)
                         return retval;
                 tape->door_locked = DOOR_UNLOCKED;
@@ -2087,7 +2061,7 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
 
         /* Lock the tape drive door so user can't eject. */
         if (tape->chrdev_dir == IDETAPE_DIR_NONE) {
-                if (!ide_tape_set_media_lock(drive, 1)) {
+                if (!ide_set_media_lock(drive, tape->disk, 1)) {
                         if (tape->door_locked != DOOR_EXPLICITLY_LOCKED)
                                 tape->door_locked = DOOR_LOCKED;
                 }
@@ -2140,7 +2114,7 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
                 (void) idetape_rewind_tape(drive);
         if (tape->chrdev_dir == IDETAPE_DIR_NONE) {
                 if (tape->door_locked == DOOR_LOCKED) {
-                        if (!ide_tape_set_media_lock(drive, 0))
+                        if (!ide_set_media_lock(drive, tape->disk, 0))
                                 tape->door_locked = DOOR_UNLOCKED;
                 }
         }
@@ -2218,6 +2192,11 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive)
         }
 
         memcpy(&tape->caps, caps, 20);
+
+        /* device lacks locking support according to capabilities page */
+        if ((caps[6] & 1) == 0)
+                drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
+
         if (caps[7] & 0x02)
                 tape->blk_size = 512;
         else if (caps[7] & 0x04)
diff --git a/include/linux/ide.h b/include/linux/ide.h
index cc41a885688a..ac067a3c1be3 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -317,10 +317,10 @@ struct ide_acpi_hwif_link;
 enum {
         IDE_AFLAG_DRQ_INTERRUPT         = (1 << 0),
         IDE_AFLAG_MEDIA_CHANGED         = (1 << 1),
-
-        /* ide-cd */
         /* Drive cannot lock the door. */
         IDE_AFLAG_NO_DOORLOCK           = (1 << 2),
+
+        /* ide-cd */
         /* Drive cannot eject the disc. */
         IDE_AFLAG_NO_EJECT              = (1 << 3),
         /* Drive is a pre ATAPI 1.2 drive. */
@@ -1142,6 +1142,8 @@ void ide_queue_pc_head(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *,
                        struct request *);
 int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *);
 
+int ide_set_media_lock(ide_drive_t *, struct gendisk *, int);
+
 ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
         ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry,
         void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *),