ide-tape: remove the BKL
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>
This commit is contained in:
parent
3f911a6e6b
commit
cbba2fa7b2
|
@ -221,6 +221,8 @@ typedef struct ide_tape_obj {
|
||||||
|
|
||||||
static DEFINE_MUTEX(idetape_ref_mutex);
|
static DEFINE_MUTEX(idetape_ref_mutex);
|
||||||
|
|
||||||
|
static DEFINE_MUTEX(idetape_chrdev_mutex);
|
||||||
|
|
||||||
static struct class *idetape_sysfs_class;
|
static struct class *idetape_sysfs_class;
|
||||||
|
|
||||||
static void ide_tape_release(struct device *);
|
static void ide_tape_release(struct device *);
|
||||||
|
@ -1457,10 +1459,11 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
|
||||||
if (i >= MAX_HWIFS * MAX_DRIVES)
|
if (i >= MAX_HWIFS * MAX_DRIVES)
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
|
||||||
lock_kernel();
|
mutex_lock(&idetape_chrdev_mutex);
|
||||||
|
|
||||||
tape = ide_tape_get(NULL, true, i);
|
tape = ide_tape_get(NULL, true, i);
|
||||||
if (!tape) {
|
if (!tape) {
|
||||||
unlock_kernel();
|
mutex_unlock(&idetape_chrdev_mutex);
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1519,12 +1522,15 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
|
||||||
tape->door_locked = DOOR_LOCKED;
|
tape->door_locked = DOOR_LOCKED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
unlock_kernel();
|
mutex_unlock(&idetape_chrdev_mutex);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_put_tape:
|
out_put_tape:
|
||||||
ide_tape_put(tape);
|
ide_tape_put(tape);
|
||||||
unlock_kernel();
|
|
||||||
|
mutex_unlock(&idetape_chrdev_mutex);
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1551,7 +1557,8 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
|
||||||
ide_drive_t *drive = tape->drive;
|
ide_drive_t *drive = tape->drive;
|
||||||
unsigned int minor = iminor(inode);
|
unsigned int minor = iminor(inode);
|
||||||
|
|
||||||
lock_kernel();
|
mutex_lock(&idetape_chrdev_mutex);
|
||||||
|
|
||||||
tape = drive->driver_data;
|
tape = drive->driver_data;
|
||||||
|
|
||||||
ide_debug_log(IDE_DBG_FUNC, "enter");
|
ide_debug_log(IDE_DBG_FUNC, "enter");
|
||||||
|
@ -1575,7 +1582,9 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
|
||||||
}
|
}
|
||||||
clear_bit(ilog2(IDE_AFLAG_BUSY), &drive->atapi_flags);
|
clear_bit(ilog2(IDE_AFLAG_BUSY), &drive->atapi_flags);
|
||||||
ide_tape_put(tape);
|
ide_tape_put(tape);
|
||||||
unlock_kernel();
|
|
||||||
|
mutex_unlock(&idetape_chrdev_mutex);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue