]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
bsg: add SG_IO to SG v4
authorFUJITA Tomonori <tomof@acm.org>
Wed, 20 Dec 2006 10:20:57 +0000 (11:20 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 16 Jul 2007 06:52:44 +0000 (08:52 +0200)
This adds SG_IO support to SG v4.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/bsg.c

index 6d139d20ec994be98481309a20f03186e04a6c13..9dc5d36a52e5700ff807f6a27d0d931e9231abe8 100644 (file)
@@ -945,8 +945,27 @@ bsg_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                void __user *uarg = (void __user *) arg;
                return scsi_cmd_ioctl(file, bd->disk, cmd, uarg);
        }
-       case SG_IO:
-               return -EINVAL;
+       case SG_IO: {
+               struct request *rq;
+               struct bio *bio;
+               struct sg_io_v4 hdr;
+
+               if (copy_from_user(&hdr, uarg, sizeof(hdr)))
+                       return -EFAULT;
+
+               rq = bsg_map_hdr(bd, &hdr);
+               if (IS_ERR(rq))
+                       return PTR_ERR(rq);
+
+               bio = rq->bio;
+               blk_execute_rq(bd->queue, bd->disk, rq, 0);
+               blk_complete_sgv4_hdr_rq(rq, &hdr, bio);
+
+               if (copy_to_user(uarg, &hdr, sizeof(hdr)))
+                       return -EFAULT;
+               else
+                       return 0;
+       }
        /*
         * block device ioctls
         */