Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)
  [SCSI] qla2xxx: Update version number to 8.03.00-k1.
  [SCSI] qla2xxx: Add ISP81XX support.
  [SCSI] qla2xxx: Use proper request/response queues with MQ instantiations.
  [SCSI] qla2xxx: Correct MQ-chain information retrieval during a firmware dump.
  [SCSI] qla2xxx: Collapse EFT/FCE copy procedures during a firmware dump.
  [SCSI] qla2xxx: Don't pollute kernel logs with ZIO/RIO status messages.
  [SCSI] qla2xxx: Don't fallback to interrupt-polling during re-initialization with MSI-X enabled.
  [SCSI] qla2xxx: Remove support for reading/writing HW-event-log.
  [SCSI] cxgb3i: add missing include
  [SCSI] scsi_lib: fix DID_RESET status problems
  [SCSI] fc transport: restore missing dev_loss_tmo callback to LLDD
  [SCSI] aha152x_cs: Fix regression that keeps driver from using shared interrupts
  [SCSI] sd: Correctly handle 6-byte commands with DIX
  [SCSI] sd: DIF: Fix tagging on platforms with signed char
  [SCSI] sd: DIF: Show app tag on error
  [SCSI] Fix error handling for DIF/DIX
  [SCSI] scsi_lib: don't decrement busy counters when inserting commands
  [SCSI] libsas: fix test for negative unsigned and typos
  [SCSI] a2091, gvp11: kill warn_unused_result warnings
  [SCSI] fusion: Move a dereference below a NULL test
  ...

Fixed up trivial conflict due to moving the async part of sd_probe
around in the async probes vs using dev_set_name() in naming.

1 files changed, 10 insertions, 9 deletions

diff --git a/block/blk-map.c b/block/blk-map.c
index 2990447f45e9..f103729b462f 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -42,7 +42,7 @@ static int __blk_rq_unmap_user(struct bio *bio)
 
 static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
                              struct rq_map_data *map_data, void __user *ubuf,
-                             unsigned int len, int null_mapped, gfp_t gfp_mask)
+                             unsigned int len, gfp_t gfp_mask)
 {
         unsigned long uaddr;
         struct bio *bio, *orig_bio;
@@ -63,7 +63,7 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
         if (IS_ERR(bio))
                 return PTR_ERR(bio);
 
-        if (null_mapped)
+        if (map_data && map_data->null_mapped)
                 bio->bi_flags |= (1 << BIO_NULL_MAPPED);
 
         orig_bio = bio;
@@ -114,17 +114,15 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
 {
         unsigned long bytes_read = 0;
         struct bio *bio = NULL;
-        int ret, null_mapped = 0;
+        int ret;
 
         if (len > (q->max_hw_sectors << 9))
                 return -EINVAL;
         if (!len)
                 return -EINVAL;
-        if (!ubuf) {
-                if (!map_data || rq_data_dir(rq) != READ)
-                        return -EINVAL;
-                null_mapped = 1;
-        }
+
+        if (!ubuf && (!map_data || !map_data->null_mapped))
+                return -EINVAL;
 
         while (bytes_read != len) {
                 unsigned long map_len, end, start;
@@ -143,13 +141,16 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
                         map_len -= PAGE_SIZE;
 
                 ret = __blk_rq_map_user(q, rq, map_data, ubuf, map_len,
-                                        null_mapped, gfp_mask);
+                                        gfp_mask);
                 if (ret < 0)
                         goto unmap_rq;
                 if (!bio)
                         bio = rq->bio;
                 bytes_read += ret;
                 ubuf += ret;
+
+                if (map_data)
+                        map_data->offset += ret;
         }
 
         if (!bio_flagged(bio, BIO_USER_MAPPED))