bd_claim_by_disk: fix warning

4210df28 · Andrew Morton <[email protected]> · 2007-07-15 23:41:28 -07:00

Fix this:

fs/block_dev.c: In function 'bd_claim_by_disk':
fs/block_dev.c:970: warning: 'found' may be used uninitialized in this function

and given that free_bd_holder() now needs free(NULL)-is-legal behaviour, we
can simplify bd_release_from_kobject().

Cc: Bjorn Steinbrink <[email protected]>
Cc: Johannes Weiner <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 4210df283cc703bc494f450c91b8311bdf7fe5ee
Parents: 4e91672c

Changes

1 files changed · +7 −10

File	Status	Add	Del	Content
fs/block_dev.c	modified	+7	−10	View file

fs/block_dev.c

View file

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 75c47a2..3635315 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -963,20 +963,20 @@ static int bd_claim_by_kobject(struct block_device *bdev, void *holder,
 
 	err = bd_claim(bdev, holder);
 	if (err)
-		goto out;
+		goto fail;
 
 	found = find_bd_holder(bdev, bo);
 	if (found)
-		goto out;
+		goto fail;
 
 	err = add_bd_holder(bdev, bo);
 	if (err)
 		bd_release(bdev);
-
-out:
-	if (err || found)
-		free_bd_holder(bo);
+	else
+		bo = NULL;
+fail:
 	mutex_unlock(&bdev->bd_mutex);
+	free_bd_holder(bo);
 	return err;
 }
 
@@ -991,15 +991,12 @@ out:
 static void bd_release_from_kobject(struct block_device *bdev,
 					struct kobject *kobj)
 {
-	struct bd_holder *bo;
-
 	if (!kobj)
 		return;
 
 	mutex_lock(&bdev->bd_mutex);
 	bd_release(bdev);
-	if ((bo = del_bd_holder(bdev, kobj)))
-		free_bd_holder(bo);
+	free_bd_holder(del_bd_holder(bdev, kobj));
 	mutex_unlock(&bdev->bd_mutex);
 }
 