Browse Source

[PATCH] find_bd_holder() fix

fs/block_dev.c: In function 'find_bd_holder':
fs/block_dev.c:666: warning: return makes integer from pointer without a cast
fs/block_dev.c:669: warning: return makes integer from pointer without a cast
fs/block_dev.c: In function 'add_bd_holder':
fs/block_dev.c:685: warning: unused variable 'tmp'
fs/block_dev.c: In function 'bd_claim_by_kobject':
fs/block_dev.c:773: warning: assignment makes pointer from integer without a cast

Acked-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton 18 years ago
parent
commit
36a561d6a9
1 changed files with 2 additions and 2 deletions
  1. 2 2
      fs/block_dev.c

+ 2 - 2
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 found, increment the reference count and return the pointer.
  * If not found, returns NULL.
  * 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;
 	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)
 static int add_bd_holder(struct block_device *bdev, struct bd_holder *bo)
 {
 {
-	struct bd_holder *tmp;
 	int ret;
 	int ret;
 
 
 	if (!bo)
 	if (!bo)