From 5a77f5860e563df1da55bc383d1a1389732233d1 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 13 Apr 2009 20:03:10 +0200
Subject: [PATCH] --- yaml --- r: 143331 b: refs/heads/master c:
 91e463c8f5f7a5b09d3d034c01a88567af60c504 h: refs/heads/master i:   143329:
 85519985b4fbb70d26c176b88b32f17c3eb365dd   143327:
 be3d45740204678069b1c2db8050ce26f7c32f3f v: v3

---
 [refs]                   | 2 +-
 trunk/block/scsi_ioctl.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index db4768cd3b9f..c10ad7f6952d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6ceb25e8d8bccf826848c2621a50d02c0a7f4ae
+refs/heads/master: 91e463c8f5f7a5b09d3d034c01a88567af60c504
diff --git a/trunk/block/scsi_ioctl.c b/trunk/block/scsi_ioctl.c
index 626ee274c5c4..84b7f8709f41 100644
--- a/trunk/block/scsi_ioctl.c
+++ b/trunk/block/scsi_ioctl.c
@@ -217,7 +217,7 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
 static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,
 				 struct bio *bio)
 {
-	int ret = 0;
+	int r, ret = 0;
 
 	/*
 	 * fill in all the output members
@@ -242,7 +242,9 @@ static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,
 			ret = -EFAULT;
 	}
 
-	blk_rq_unmap_user(bio);
+	r = blk_rq_unmap_user(bio);
+	if (!ret)
+		ret = r;
 	blk_put_request(rq);
 
 	return ret;