From 96f6470b13fda0f470dba9799df5f62cd74c2ec9 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 8 Dec 2006 02:36:18 -0800 Subject: [PATCH] --- yaml --- r: 43506 b: refs/heads/master c: c48f70c3d046f021b1c22438604ef2a583380eca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/block_dev.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ecb7af2b7571..c42fb575716f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d63a5a74dee87883fda6b7d170244acaac5b05e8 +refs/heads/master: c48f70c3d046f021b1c22438604ef2a583380eca diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c index 846f32d51be7..f3c3a44dd8b6 100644 --- a/trunk/fs/block_dev.c +++ b/trunk/fs/block_dev.c @@ -902,6 +902,7 @@ EXPORT_SYMBOL(bd_set_size); static int __blkdev_get(struct block_device *bdev, mode_t mode, unsigned flags, int for_part); +static int __blkdev_put(struct block_device *bdev, int for_part); static int do_open(struct block_device *bdev, struct file *file, int for_part) { @@ -987,7 +988,7 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part) bdev->bd_disk = NULL; bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info; if (bdev != bdev->bd_contains) - blkdev_put(bdev->bd_contains); + __blkdev_put(bdev->bd_contains, 1); bdev->bd_contains = NULL; put_disk(disk); module_put(owner);