aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-bio-list.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-29 03:51:15 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-29 03:51:15 -0500
commit4ab432677957e0a064bba3690004d3244de8ad6c (patch)
tree4ef5785f20be6f62bfc7fbe4f124e1751c9cabf5 /drivers/md/dm-bio-list.h
parent30765528d156e58d41ed07cae8726c9105111b9d (diff)
parent624f54be206adf970cd8eece16446b027913e533 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/md/dm-bio-list.h')
-rw-r--r--drivers/md/dm-bio-list.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/dm-bio-list.h b/drivers/md/dm-bio-list.h
index bc021e1fd4d1..bbf4615f0e30 100644
--- a/drivers/md/dm-bio-list.h
+++ b/drivers/md/dm-bio-list.h
@@ -33,6 +33,9 @@ static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
33 33
34static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2) 34static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2)
35{ 35{
36 if (!bl2->head)
37 return;
38
36 if (bl->tail) 39 if (bl->tail)
37 bl->tail->bi_next = bl2->head; 40 bl->tail->bi_next = bl2->head;
38 else 41 else