---

yaml --- r: 167222 b: refs/heads/master c: e27168f h: refs/heads/master v: v3
git-mirror · Oct 2, 2009 · 008f984 · 008f984
1 parent 587c5da
commit 008f984
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5915136d4d3954867cced8a2297bddd16caf36a1
+refs/heads/master: e27168f8c337b12b8aa8d59c3123c79d2f83603d
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
@@ -1708,18 +1708,18 @@ static int sg_finish_rem_req(Sg_request * srp)
 	Sg_scatter_hold *req_schp = &srp->data;
 
 	SCSI_LOG_TIMEOUT(4, printk("sg_finish_rem_req: res_used=%d\n", (int) srp->res_used));
-	if (srp->res_used)
-		sg_unlink_reserve(sfp, srp);
-	else
-		sg_remove_scat(req_schp);
-
 	if (srp->rq) {
 		if (srp->bio)
 			ret = blk_rq_unmap_user(srp->bio);
 
 		blk_put_request(srp->rq);
 	}
 
+	if (srp->res_used)
+		sg_unlink_reserve(sfp, srp);
+	else
+		sg_remove_scat(req_schp);
+
 	sg_remove_request(sfp, srp);
 
 	return ret;