From: Jens Axboe Date: Mon, 7 Jun 2010 18:17:38 +0000 (+0200) Subject: block: remove duplicate BUG_ON() in bd_finish_claiming() X-Git-Tag: v2.6.35-rc3~11^2~2 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=3e6c05052c262ebe7fdd85e75e9d4f956cdd8d82 block: remove duplicate BUG_ON() in bd_finish_claiming() We do the same BUG_ON() just a line later when calling into __bd_abort_claiming(). Reported-by: Tejun Heo Signed-off-by: Jens Axboe --- diff --git a/fs/block_dev.c b/fs/block_dev.c index a1642ef..99d6af8 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -817,7 +817,6 @@ static void bd_finish_claiming(struct block_device *bdev, struct block_device *whole, void *holder) { spin_lock(&bdev_lock); - BUG_ON(whole->bd_claiming != holder); BUG_ON(!bd_may_claim(bdev, whole, holder)); __bd_claim(bdev, whole, holder); __bd_abort_claiming(whole, holder); /* not actually an abort */