Skip to content

Commit

Permalink
osst: cdev lock_kernel() pushdown.
Browse files Browse the repository at this point in the history
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  • Loading branch information
Jonathan Corbet committed Jun 20, 2008
1 parent eb09d3d commit 647d87b
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion drivers/scsi/osst.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ static const char * osst_version = "0.99.4";
#include <linux/moduleparam.h>
#include <linux/delay.h>
#include <linux/jiffies.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/dma.h>
#include <asm/system.h>
Expand Down Expand Up @@ -4359,7 +4360,7 @@ static int osst_int_ioctl(struct osst_tape * STp, struct osst_request ** aSRpnt,


/* Open the device */
static int os_scsi_tape_open(struct inode * inode, struct file * filp)
static int __os_scsi_tape_open(struct inode * inode, struct file * filp)
{
unsigned short flags;
int i, b_size, new_session = 0, retval = 0;
Expand Down Expand Up @@ -4725,6 +4726,18 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)
return retval;
}

/* BKL pushdown: spaghetti avoidance wrapper */
static int os_scsi_tape_open(struct inode * inode, struct file * filp)
{
int ret;

lock_kernel();
ret = __os_scsi_tape_open(inode, filp);
unlock_kernel();
return ret;
}



/* Flush the tape buffer before close */
static int os_scsi_tape_flush(struct file * filp, fl_owner_t id)
Expand Down

0 comments on commit 647d87b

Please sign in to comment.