lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' into for-2.6.33

Browse Source 
Conflicts:
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2009-11-03 21:14:39 +01:00
parent 150e6c67f4 4b27e1bb44
commit 2058297d2d
1608 changed files with 87812 additions and 24594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/block_dev.c
View File

@@ -1258,8 +1258,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) {