浏览代码

[PATCH] device-mapper snapshot: bio_list fix

bio_list_merge() should do nothing if the second list is empty - not oops.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
jblunck@suse.de 19 年之前
父节点
当前提交
233886dd32
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      drivers/md/dm-bio-list.h

+ 3 - 0
drivers/md/dm-bio-list.h

@@ -33,6 +33,9 @@ static inline void bio_list_add(struct bio_list *bl, struct bio *bio)
 
 
 static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2)
 static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2)
 {
 {
+	if (!bl2->head)
+		return;
+
 	if (bl->tail)
 	if (bl->tail)
 		bl->tail->bi_next = bl2->head;
 		bl->tail->bi_next = bl2->head;
 	else
 	else