---

yaml --- r: 331401 b: refs/heads/master c: f22cf8e h: refs/heads/master i: 331399: 0ea9a03 v: v3
git-mirror · Sep 28, 2012 · ee19a04 · ee19a04
1 parent 855aea0
commit ee19a04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c85a1f91b393a6c0c2ad382ba59d7618b29ab758
+refs/heads/master: f22cf8eb485260ac6e32a614121d44998d83a69a
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
@@ -90,10 +90,12 @@ static inline struct virtblk_req *virtblk_alloc_req(struct virtio_blk *vblk,
 	struct virtblk_req *vbr;
 
 	vbr = mempool_alloc(vblk->pool, gfp_mask);
-	if (vbr && use_bio)
-		sg_init_table(vbr->sg, vblk->sg_elems);
+	if (!vbr)
+		return NULL;
 
 	vbr->vblk = vblk;
+	if (use_bio)
+		sg_init_table(vbr->sg, vblk->sg_elems);
 
 	return vbr;
 }