Skip to content

Commit

Permalink
ide-tape: remove the BKL
Browse files Browse the repository at this point in the history
Replace the BKL calls in the chrdev_{open,release} interfaces with a
simple sleeping mutex.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Borislav Petkov authored and David S. Miller committed Oct 29, 2009
1 parent 3f911a6 commit cbba2fa
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions drivers/ide/ide-tape.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ typedef struct ide_tape_obj {

static DEFINE_MUTEX(idetape_ref_mutex);

static DEFINE_MUTEX(idetape_chrdev_mutex);

static struct class *idetape_sysfs_class;

static void ide_tape_release(struct device *);
Expand Down Expand Up @@ -1457,10 +1459,11 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
if (i >= MAX_HWIFS * MAX_DRIVES)
return -ENXIO;

lock_kernel();
mutex_lock(&idetape_chrdev_mutex);

tape = ide_tape_get(NULL, true, i);
if (!tape) {
unlock_kernel();
mutex_unlock(&idetape_chrdev_mutex);
return -ENXIO;
}

Expand Down Expand Up @@ -1519,12 +1522,15 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
tape->door_locked = DOOR_LOCKED;
}
}
unlock_kernel();
mutex_unlock(&idetape_chrdev_mutex);

return 0;

out_put_tape:
ide_tape_put(tape);
unlock_kernel();

mutex_unlock(&idetape_chrdev_mutex);

return retval;
}

Expand All @@ -1551,7 +1557,8 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
ide_drive_t *drive = tape->drive;
unsigned int minor = iminor(inode);

lock_kernel();
mutex_lock(&idetape_chrdev_mutex);

tape = drive->driver_data;

ide_debug_log(IDE_DBG_FUNC, "enter");
Expand All @@ -1575,7 +1582,9 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
}
clear_bit(ilog2(IDE_AFLAG_BUSY), &drive->atapi_flags);
ide_tape_put(tape);
unlock_kernel();

mutex_unlock(&idetape_chrdev_mutex);

return 0;
}

Expand Down

0 comments on commit cbba2fa

Please sign in to comment.