Skip to contentSkip to conversation

blk-mq: use BUG_ON()

PATCH In review Sudip Mukherjee 2 participants 2 messages Jan 29, 2015 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 blk-mq: use BUG_ON()

use BUG_ON() instead of using if(condition) BUG()

---
 block/blk-mq.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
block/blk-mq.c +1 -2
index 8107962..d8f0922 100644
@@ -337,8 +337,7 @@ EXPORT_SYMBOL(__blk_mq_end_request);
 
 void blk_mq_end_request(struct request *rq, int error)
 {
-	if (blk_update_request(rq, error, blk_rq_bytes(rq)))
-		BUG();
+	BUG_ON(blk_update_request(rq, error, blk_rq_bytes(rq)));
 	__blk_mq_end_request(rq, error);
 }
 EXPORT_SYMBOL(blk_mq_end_request);
Signature · 1 line
1.8.1.2
maintainer
#1 lore raw
Quoted 12 lines · Sudip Mukherjee

use BUG_ON() instead of using if(condition) BUG()

---
  block/blk-mq.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
block/blk-mq.c +0 -0
index 8107962..d8f0922 100644

block/blk-mq.c EXPORT_SYMBOL(__blk_mq_end_request); · line 341

Quoted 7 lines
block/blk-mq.c +1 -2
@@ -337,8 +337,7 @@ EXPORT_SYMBOL(__blk_mq_end_request);
 
  void blk_mq_end_request(struct request *rq, int error)
  {
-	if (blk_update_request(rq, error, blk_rq_bytes(rq)))
-		BUG();
+	BUG_ON(blk_update_request(rq, error, blk_rq_bytes(rq)));
  	__blk_mq_end_request(rq, error);

This makes it less readable than it was before, so no.

Signature · 1 line
Jens Axboe