diff options
Diffstat (limited to 'drivers/s390/block/dasd.c')
-rw-r--r-- | drivers/s390/block/dasd.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 8373ca0de8e0..38e6fa9a2012 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/hdreg.h> | 21 | #include <linux/hdreg.h> |
22 | #include <linux/async.h> | 22 | #include <linux/async.h> |
23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
24 | #include <linux/smp_lock.h> | ||
25 | 24 | ||
26 | #include <asm/ccwdev.h> | 25 | #include <asm/ccwdev.h> |
27 | #include <asm/ebcdic.h> | 26 | #include <asm/ebcdic.h> |
@@ -2236,7 +2235,6 @@ static int dasd_open(struct block_device *bdev, fmode_t mode) | |||
2236 | if (!block) | 2235 | if (!block) |
2237 | return -ENODEV; | 2236 | return -ENODEV; |
2238 | 2237 | ||
2239 | lock_kernel(); | ||
2240 | base = block->base; | 2238 | base = block->base; |
2241 | atomic_inc(&block->open_count); | 2239 | atomic_inc(&block->open_count); |
2242 | if (test_bit(DASD_FLAG_OFFLINE, &base->flags)) { | 2240 | if (test_bit(DASD_FLAG_OFFLINE, &base->flags)) { |
@@ -2271,14 +2269,12 @@ static int dasd_open(struct block_device *bdev, fmode_t mode) | |||
2271 | goto out; | 2269 | goto out; |
2272 | } | 2270 | } |
2273 | 2271 | ||
2274 | unlock_kernel(); | ||
2275 | return 0; | 2272 | return 0; |
2276 | 2273 | ||
2277 | out: | 2274 | out: |
2278 | module_put(base->discipline->owner); | 2275 | module_put(base->discipline->owner); |
2279 | unlock: | 2276 | unlock: |
2280 | atomic_dec(&block->open_count); | 2277 | atomic_dec(&block->open_count); |
2281 | unlock_kernel(); | ||
2282 | return rc; | 2278 | return rc; |
2283 | } | 2279 | } |
2284 | 2280 | ||
@@ -2286,10 +2282,8 @@ static int dasd_release(struct gendisk *disk, fmode_t mode) | |||
2286 | { | 2282 | { |
2287 | struct dasd_block *block = disk->private_data; | 2283 | struct dasd_block *block = disk->private_data; |
2288 | 2284 | ||
2289 | lock_kernel(); | ||
2290 | atomic_dec(&block->open_count); | 2285 | atomic_dec(&block->open_count); |
2291 | module_put(block->base->discipline->owner); | 2286 | module_put(block->base->discipline->owner); |
2292 | unlock_kernel(); | ||
2293 | return 0; | 2287 | return 0; |
2294 | } | 2288 | } |
2295 | 2289 | ||