From 52f58ee6a33af8c069231ec8f9b2cc5ab8ada3f1 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 30 Oct 2006 22:07:03 -0800 Subject: [PATCH] --- yaml --- r: 40500 b: refs/heads/master c: 36a561d6a95c4b89ae4845bf91456b4f784b6eec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/block_dev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 41ecbcdea511..0b70dd7ac2a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae99a78af33f00565a05dbbc6ca9b247fed002c5 +refs/heads/master: 36a561d6a95c4b89ae4845bf91456b4f784b6eec diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c index aaa8301f43f1..36c0e7af9d0f 100644 --- a/trunk/fs/block_dev.c +++ b/trunk/fs/block_dev.c @@ -651,7 +651,8 @@ static void free_bd_holder(struct bd_holder *bo) * If found, increment the reference count and return the pointer. * If not found, returns NULL. */ -static int find_bd_holder(struct block_device *bdev, struct bd_holder *bo) +static struct bd_holder *find_bd_holder(struct block_device *bdev, + struct bd_holder *bo) { struct bd_holder *tmp; @@ -677,7 +678,6 @@ static int find_bd_holder(struct block_device *bdev, struct bd_holder *bo) */ static int add_bd_holder(struct block_device *bdev, struct bd_holder *bo) { - struct bd_holder *tmp; int ret; if (!bo)