diff options
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 2fedaf8b5012..23e7513dba9c 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -347,7 +347,7 @@ static struct block_device *ext3_blkdev_get(dev_t dev, struct super_block *sb) | |||
347 | struct block_device *bdev; | 347 | struct block_device *bdev; |
348 | char b[BDEVNAME_SIZE]; | 348 | char b[BDEVNAME_SIZE]; |
349 | 349 | ||
350 | bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE); | 350 | bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE|FMODE_EXCL, sb); |
351 | if (IS_ERR(bdev)) | 351 | if (IS_ERR(bdev)) |
352 | goto fail; | 352 | goto fail; |
353 | return bdev; | 353 | return bdev; |
@@ -364,8 +364,7 @@ fail: | |||
364 | */ | 364 | */ |
365 | static int ext3_blkdev_put(struct block_device *bdev) | 365 | static int ext3_blkdev_put(struct block_device *bdev) |
366 | { | 366 | { |
367 | bd_release(bdev); | 367 | return blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL); |
368 | return blkdev_put(bdev, FMODE_READ|FMODE_WRITE); | ||
369 | } | 368 | } |
370 | 369 | ||
371 | static int ext3_blkdev_remove(struct ext3_sb_info *sbi) | 370 | static int ext3_blkdev_remove(struct ext3_sb_info *sbi) |
@@ -2136,13 +2135,6 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb, | |||
2136 | if (bdev == NULL) | 2135 | if (bdev == NULL) |
2137 | return NULL; | 2136 | return NULL; |
2138 | 2137 | ||
2139 | if (bd_claim(bdev, sb)) { | ||
2140 | ext3_msg(sb, KERN_ERR, | ||
2141 | "error: failed to claim external journal device"); | ||
2142 | blkdev_put(bdev, FMODE_READ|FMODE_WRITE); | ||
2143 | return NULL; | ||
2144 | } | ||
2145 | |||
2146 | blocksize = sb->s_blocksize; | 2138 | blocksize = sb->s_blocksize; |
2147 | hblock = bdev_logical_block_size(bdev); | 2139 | hblock = bdev_logical_block_size(bdev); |
2148 | if (blocksize < hblock) { | 2140 | if (blocksize < hblock) { |