diff options
Diffstat (limited to 'drivers/md/dm.c')
-rw-r--r-- | drivers/md/dm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index ac384b2a6a33..7967eca5a2d5 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/blkpg.h> | 15 | #include <linux/blkpg.h> |
16 | #include <linux/bio.h> | 16 | #include <linux/bio.h> |
17 | #include <linux/buffer_head.h> | 17 | #include <linux/buffer_head.h> |
18 | #include <linux/smp_lock.h> | ||
19 | #include <linux/mempool.h> | 18 | #include <linux/mempool.h> |
20 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
21 | #include <linux/idr.h> | 20 | #include <linux/idr.h> |
@@ -33,6 +32,7 @@ | |||
33 | #define DM_COOKIE_ENV_VAR_NAME "DM_COOKIE" | 32 | #define DM_COOKIE_ENV_VAR_NAME "DM_COOKIE" |
34 | #define DM_COOKIE_LENGTH 24 | 33 | #define DM_COOKIE_LENGTH 24 |
35 | 34 | ||
35 | static DEFINE_MUTEX(dm_mutex); | ||
36 | static const char *_name = DM_NAME; | 36 | static const char *_name = DM_NAME; |
37 | 37 | ||
38 | static unsigned int major = 0; | 38 | static unsigned int major = 0; |
@@ -344,7 +344,7 @@ static int dm_blk_open(struct block_device *bdev, fmode_t mode) | |||
344 | { | 344 | { |
345 | struct mapped_device *md; | 345 | struct mapped_device *md; |
346 | 346 | ||
347 | lock_kernel(); | 347 | mutex_lock(&dm_mutex); |
348 | spin_lock(&_minor_lock); | 348 | spin_lock(&_minor_lock); |
349 | 349 | ||
350 | md = bdev->bd_disk->private_data; | 350 | md = bdev->bd_disk->private_data; |
@@ -362,7 +362,7 @@ static int dm_blk_open(struct block_device *bdev, fmode_t mode) | |||
362 | 362 | ||
363 | out: | 363 | out: |
364 | spin_unlock(&_minor_lock); | 364 | spin_unlock(&_minor_lock); |
365 | unlock_kernel(); | 365 | mutex_unlock(&dm_mutex); |
366 | 366 | ||
367 | return md ? 0 : -ENXIO; | 367 | return md ? 0 : -ENXIO; |
368 | } | 368 | } |
@@ -371,10 +371,10 @@ static int dm_blk_close(struct gendisk *disk, fmode_t mode) | |||
371 | { | 371 | { |
372 | struct mapped_device *md = disk->private_data; | 372 | struct mapped_device *md = disk->private_data; |
373 | 373 | ||
374 | lock_kernel(); | 374 | mutex_lock(&dm_mutex); |
375 | atomic_dec(&md->open_count); | 375 | atomic_dec(&md->open_count); |
376 | dm_put(md); | 376 | dm_put(md); |
377 | unlock_kernel(); | 377 | mutex_unlock(&dm_mutex); |
378 | 378 | ||
379 | return 0; | 379 | return 0; |
380 | } | 380 | } |