block: bio_remaining_done() isn't unlikely

Christoph Hellwig · axboe · commit 2b885517110c · 2016-03-14T08:55:25.000-06:00
We use bio chaining during most I/Os these days due to the delayed
bio splitting.  Additionally XFS will start using it, and there is
a pending direct I/O rewrite also making heavy use for it.  Don't
pretend it's always unlikely, and let the branch predictor do it's
job instead.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Jens Axboe &lt;axboe@fb.com&gt;
diff --git a/block/bio.c b/block/bio.c
@@ -1746,7 +1746,7 @@ static inline bool bio_remaining_done(struct bio *bio)
 void bio_endio(struct bio *bio)
 {
 again:
-	if (unlikely(!bio_remaining_done(bio)))
+	if (!bio_remaining_done(bio))
 		return;
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -1746,7 +1746,7 @@ static inline bool bio_remaining_done(struct bio *bio)`
`1746`	`1746`	`void bio_endio(struct bio *bio)`
`1747`	`1747`	`{`
`1748`	`1748`	`again:`
`1749`		`- if (unlikely(!bio_remaining_done(bio)))`
	`1749`	`+ if (!bio_remaining_done(bio))`
`1750`	`1750`	`return;`
`1751`	`1751`
`1752`	`1752`	`/*`