summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2006-11-13 18:04:59 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-13 18:47:00 +0100
commit616e8a091a035c0bd9b871695f4af191df123caa (patch)
tree9b9c97c6b55a9a097bafb453085375497b916fdc /block
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/... (diff)
downloadlinux-616e8a091a035c0bd9b871695f4af191df123caa.tar.xz
linux-616e8a091a035c0bd9b871695f4af191df123caa.zip
[PATCH] Fix bad data direction in SG_IO
Contrary to what the name misleads you to believe, SG_DXFER_TO_FROM_DEV is really just a normal read seen from the device side. This patch fixes http://lkml.org/lkml/2006/10/13/100 Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'block')
-rw-r--r--block/scsi_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 2dc326421a24..a19338e6215d 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -246,10 +246,10 @@ static int sg_io(struct file *file, request_queue_t *q,
switch (hdr->dxfer_direction) {
default:
return -EINVAL;
- case SG_DXFER_TO_FROM_DEV:
case SG_DXFER_TO_DEV:
writing = 1;
break;
+ case SG_DXFER_TO_FROM_DEV:
case SG_DXFER_FROM_DEV:
break;
}