diff options
| -rw-r--r-- | drivers/mtd/mtd_blkdevs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 352831baf785..040c2d923807 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c | |||
| @@ -181,7 +181,6 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) | |||
| 181 | if (!dev) | 181 | if (!dev) |
| 182 | return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/ | 182 | return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/ |
| 183 | 183 | ||
| 184 | lock_kernel(); | ||
| 185 | mutex_lock(&dev->lock); | 184 | mutex_lock(&dev->lock); |
| 186 | 185 | ||
| 187 | if (dev->open++) | 186 | if (dev->open++) |
| @@ -198,7 +197,6 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) | |||
| 198 | unlock: | 197 | unlock: |
| 199 | mutex_unlock(&dev->lock); | 198 | mutex_unlock(&dev->lock); |
| 200 | blktrans_dev_put(dev); | 199 | blktrans_dev_put(dev); |
| 201 | unlock_kernel(); | ||
| 202 | return ret; | 200 | return ret; |
| 203 | } | 201 | } |
| 204 | 202 | ||
| @@ -210,7 +208,6 @@ static int blktrans_release(struct gendisk *disk, fmode_t mode) | |||
| 210 | if (!dev) | 208 | if (!dev) |
| 211 | return ret; | 209 | return ret; |
| 212 | 210 | ||
| 213 | lock_kernel(); | ||
| 214 | mutex_lock(&dev->lock); | 211 | mutex_lock(&dev->lock); |
| 215 | 212 | ||
| 216 | if (--dev->open) | 213 | if (--dev->open) |
| @@ -226,7 +223,6 @@ static int blktrans_release(struct gendisk *disk, fmode_t mode) | |||
| 226 | unlock: | 223 | unlock: |
| 227 | mutex_unlock(&dev->lock); | 224 | mutex_unlock(&dev->lock); |
| 228 | blktrans_dev_put(dev); | 225 | blktrans_dev_put(dev); |
| 229 | unlock_kernel(); | ||
| 230 | return ret; | 226 | return ret; |
| 231 | } | 227 | } |
| 232 | 228 | ||
| @@ -259,7 +255,6 @@ static int blktrans_ioctl(struct block_device *bdev, fmode_t mode, | |||
| 259 | if (!dev) | 255 | if (!dev) |
| 260 | return ret; | 256 | return ret; |
| 261 | 257 | ||
| 262 | lock_kernel(); | ||
| 263 | mutex_lock(&dev->lock); | 258 | mutex_lock(&dev->lock); |
| 264 | 259 | ||
| 265 | if (!dev->mtd) | 260 | if (!dev->mtd) |
| @@ -274,7 +269,6 @@ static int blktrans_ioctl(struct block_device *bdev, fmode_t mode, | |||
| 274 | } | 269 | } |
| 275 | unlock: | 270 | unlock: |
| 276 | mutex_unlock(&dev->lock); | 271 | mutex_unlock(&dev->lock); |
| 277 | unlock_kernel(); | ||
| 278 | blktrans_dev_put(dev); | 272 | blktrans_dev_put(dev); |
| 279 | return ret; | 273 | return ret; |
| 280 | } | 274 | } |
