Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4210df28 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

bd_claim_by_disk: fix warning 



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 <B.Steinbrink@gmx.de>
Cc: Johannes Weiner <hannes-kernel@saeurebad.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4e91672c

fs/block_dev.c

+7 −10
Original line number Diff line number Diff line
@@ -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 @@ static int bd_claim_by_kobject(struct block_device *bdev, void *holder, 
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);

}