git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/scsi: use nr_irqs
[safe/jmp/linux-2.6]
/
block
/
scsi_ioctl.c
diff --git
a/block/scsi_ioctl.c
b/block/scsi_ioctl.c
index
ec4b7f2
..
c34272a
100644
(file)
--- a/
block/scsi_ioctl.c
+++ b/
block/scsi_ioctl.c
@@
-185,6
+185,7
@@
void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
__set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok);
__set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok);
__set_bit(GPCMD_SET_STREAMING, filter->write_ok);
__set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok);
__set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok);
__set_bit(GPCMD_SET_STREAMING, filter->write_ok);
+ __set_bit(GPCMD_SET_READ_AHEAD, filter->write_ok);
}
EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults);
}
EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults);
@@
-313,11
+314,12
@@
static int sg_io(struct file *file, struct request_queue *q,
goto out;
}
goto out;
}
- ret = blk_rq_map_user_iov(q, rq, iov, hdr->iovec_count,
- hdr->dxfer_len);
+ ret = blk_rq_map_user_iov(q, rq,
NULL,
iov, hdr->iovec_count,
+ hdr->dxfer_len
, GFP_KERNEL
);
kfree(iov);
} else if (hdr->dxfer_len)
kfree(iov);
} else if (hdr->dxfer_len)
- ret = blk_rq_map_user(q, rq, hdr->dxferp, hdr->dxfer_len);
+ ret = blk_rq_map_user(q, rq, NULL, hdr->dxferp, hdr->dxfer_len,
+ GFP_KERNEL);
if (ret)
goto out;
if (ret)
goto out;