aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-06-07 14:17:38 -0400
committerJens Axboe <jaxboe@fusionio.com>2010-06-10 13:08:34 -0400
commit3e6c05052c262ebe7fdd85e75e9d4f956cdd8d82 (patch)
tree35b65924594cc085cc21b36c1b9f918961e760e0
parentb0018361c3f934858592cbbb5e1a4f318c2a70ed (diff)
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 <tj@kernel.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--fs/block_dev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index a1642ef60197..99d6af811747 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -817,7 +817,6 @@ static void bd_finish_claiming(struct block_device *bdev,
817 struct block_device *whole, void *holder) 817 struct block_device *whole, void *holder)
818{ 818{
819 spin_lock(&bdev_lock); 819 spin_lock(&bdev_lock);
820 BUG_ON(whole->bd_claiming != holder);
821 BUG_ON(!bd_may_claim(bdev, whole, holder)); 820 BUG_ON(!bd_may_claim(bdev, whole, holder));
822 __bd_claim(bdev, whole, holder); 821 __bd_claim(bdev, whole, holder);
823 __bd_abort_claiming(whole, holder); /* not actually an abort */ 822 __bd_abort_claiming(whole, holder); /* not actually an abort */