aboutsummaryrefslogtreecommitdiffstats
path: root/block/bsg.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/bsg.c')
-rw-r--r--block/bsg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/block/bsg.c b/block/bsg.c
index 12c287b98625..d60eee549405 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -31,7 +31,7 @@
31#define BSG_VERSION "0.4" 31#define BSG_VERSION "0.4"
32 32
33struct bsg_device { 33struct bsg_device {
34 request_queue_t *queue; 34 struct request_queue *queue;
35 spinlock_t lock; 35 spinlock_t lock;
36 struct list_head busy_list; 36 struct list_head busy_list;
37 struct list_head done_list; 37 struct list_head done_list;
@@ -172,7 +172,7 @@ unlock:
172 return ret; 172 return ret;
173} 173}
174 174
175static int blk_fill_sgv4_hdr_rq(request_queue_t *q, struct request *rq, 175static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
176 struct sg_io_v4 *hdr, int has_write_perm) 176 struct sg_io_v4 *hdr, int has_write_perm)
177{ 177{
178 memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */ 178 memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
@@ -206,7 +206,7 @@ static int blk_fill_sgv4_hdr_rq(request_queue_t *q, struct request *rq,
206 * Check if sg_io_v4 from user is allowed and valid 206 * Check if sg_io_v4 from user is allowed and valid
207 */ 207 */
208static int 208static int
209bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw) 209bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)
210{ 210{
211 int ret = 0; 211 int ret = 0;
212 212
@@ -242,7 +242,7 @@ bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw)
242static struct request * 242static struct request *
243bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) 243bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr)
244{ 244{
245 request_queue_t *q = bd->queue; 245 struct request_queue *q = bd->queue;
246 struct request *rq, *next_rq = NULL; 246 struct request *rq, *next_rq = NULL;
247 int ret, rw; 247 int ret, rw;
248 unsigned int dxfer_len; 248 unsigned int dxfer_len;
@@ -337,7 +337,7 @@ static void bsg_rq_end_io(struct request *rq, int uptodate)
337 * do final setup of a 'bc' and submit the matching 'rq' to the block 337 * do final setup of a 'bc' and submit the matching 'rq' to the block
338 * layer for io 338 * layer for io
339 */ 339 */
340static void bsg_add_command(struct bsg_device *bd, request_queue_t *q, 340static void bsg_add_command(struct bsg_device *bd, struct request_queue *q,
341 struct bsg_command *bc, struct request *rq) 341 struct bsg_command *bc, struct request *rq)
342{ 342{
343 rq->sense = bc->sense; 343 rq->sense = bc->sense;
@@ -603,7 +603,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf,
603 bc = NULL; 603 bc = NULL;
604 ret = 0; 604 ret = 0;
605 while (nr_commands) { 605 while (nr_commands) {
606 request_queue_t *q = bd->queue; 606 struct request_queue *q = bd->queue;
607 607
608 bc = bsg_alloc_command(bd); 608 bc = bsg_alloc_command(bd);
609 if (IS_ERR(bc)) { 609 if (IS_ERR(bc)) {