ide-tape: remove the BKL
PATCH 1/1 ide-tape: remove the BKL
Hi,
one less BKL user. Tested on a Seagate STT8000A, ATAPI TAPE drive.
---
Quoted 1 line
From
16e58d4d74a5f3a02204e2fe861d2cb3b3ee65fbMon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Mon, 5 Oct 2009 07:57:26 +0200
Subject: [PATCH] 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 <[email protected]>
--- drivers/ide/ide-tape.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
drivers/ide/ide-tape.c +15 -6
@@ -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 *);
@@ -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 ; }
@@ -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; }
@@ -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" );
@@ -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 ; }
Signature · 6 lines
1.6.3.3
--
Regards/Gruss,
Boris.David Miller
AppliedFrom: Borislav Petkov <[email protected]>
Date: Sun, 11 Oct 2009 12:25:19 +0200
Quoted 4 lines
Replace the BKL calls in the chrdev_{open,release} interfaces with a simple sleeping mutex.
Signed-off-by Borislav Petkov <[email protected]>
Applied to ide-next-2.6