projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: autoconvert trivial BKL users to private mutex
[cascardo/linux.git]
/
drivers
/
block
/
paride
/
pd.c
diff --git
a/drivers/block/paride/pd.c
b/drivers/block/paride/pd.c
index
985f0d4
..
c0ee155
100644
(file)
--- a/
drivers/block/paride/pd.c
+++ b/
drivers/block/paride/pd.c
@@
-153,10
+153,11
@@
enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/kernel.h>
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/kernel.h>
-#include <linux/
smp_lock
.h>
+#include <linux/
mutex
.h>
#include <asm/uaccess.h>
#include <linux/workqueue.h>
#include <asm/uaccess.h>
#include <linux/workqueue.h>
+static DEFINE_MUTEX(pd_mutex);
static DEFINE_SPINLOCK(pd_lock);
module_param(verbose, bool, 0);
static DEFINE_SPINLOCK(pd_lock);
module_param(verbose, bool, 0);
@@
-736,14
+737,14
@@
static int pd_open(struct block_device *bdev, fmode_t mode)
{
struct pd_unit *disk = bdev->bd_disk->private_data;
{
struct pd_unit *disk = bdev->bd_disk->private_data;
-
lock_kernel(
);
+
mutex_lock(&pd_mutex
);
disk->access++;
if (disk->removable) {
pd_special_command(disk, pd_media_check);
pd_special_command(disk, pd_door_lock);
}
disk->access++;
if (disk->removable) {
pd_special_command(disk, pd_media_check);
pd_special_command(disk, pd_door_lock);
}
-
unlock_kernel(
);
+
mutex_unlock(&pd_mutex
);
return 0;
}
return 0;
}
@@
-771,10
+772,10
@@
static int pd_ioctl(struct block_device *bdev, fmode_t mode,
switch (cmd) {
case CDROMEJECT:
switch (cmd) {
case CDROMEJECT:
-
lock_kernel(
);
+
mutex_lock(&pd_mutex
);
if (disk->access == 1)
pd_special_command(disk, pd_eject);
if (disk->access == 1)
pd_special_command(disk, pd_eject);
-
unlock_kernel(
);
+
mutex_unlock(&pd_mutex
);
return 0;
default:
return -EINVAL;
return 0;
default:
return -EINVAL;
@@
-785,10
+786,10
@@
static int pd_release(struct gendisk *p, fmode_t mode)
{
struct pd_unit *disk = p->private_data;
{
struct pd_unit *disk = p->private_data;
-
lock_kernel(
);
+
mutex_lock(&pd_mutex
);
if (!--disk->access && disk->removable)
pd_special_command(disk, pd_door_unlock);
if (!--disk->access && disk->removable)
pd_special_command(disk, pd_door_unlock);
-
unlock_kernel(
);
+
mutex_unlock(&pd_mutex
);
return 0;
}
return 0;
}