diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:17:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:17:19 -0700 |
| commit | 68e71d1902a820c9bc7a5a6c23260841caafff33 (patch) | |
| tree | a9ba52bdfef99e7bdc5f8623772d76789f7b7c8b /fs | |
| parent | 066455d471e997adbcc98dda62eaf461e8b6556e (diff) | |
| parent | 592b09a42fc3ae6737a0f3ecf4fee42ecd0296f8 (diff) | |
| download | linux-3.10-68e71d1902a820c9bc7a5a6c23260841caafff33.tar.gz linux-3.10-68e71d1902a820c9bc7a5a6c23260841caafff33.tar.bz2 linux-3.10-68e71d1902a820c9bc7a5a6c23260841caafff33.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
backing-dev: ensure that a removed bdi no longer has super_block referencing it
block: use after free bug in __blkdev_get
block: silently error unsupported empty barriers too
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/block_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 9cf4b926f8e..8bed0557d88 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1248,8 +1248,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9); } } else { - put_disk(disk); module_put(disk->fops->owner); + put_disk(disk); disk = NULL; if (bdev->bd_contains == bdev) { if (bdev->bd_disk->fops->open) { |