diff options
Diffstat (limited to 'block/bsg.c')
-rw-r--r-- | block/bsg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/block/bsg.c b/block/bsg.c index b571869928a8..3b2f05258a92 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #define BSG_VERSION "0.4" | 37 | #define BSG_VERSION "0.4" |
38 | 38 | ||
39 | struct bsg_device { | 39 | struct bsg_device { |
40 | request_queue_t *queue; | 40 | struct request_queue *queue; |
41 | spinlock_t lock; | 41 | spinlock_t lock; |
42 | struct list_head busy_list; | 42 | struct list_head busy_list; |
43 | struct list_head done_list; | 43 | struct list_head done_list; |
@@ -180,7 +180,7 @@ unlock: | |||
180 | return ret; | 180 | return ret; |
181 | } | 181 | } |
182 | 182 | ||
183 | static int blk_fill_sgv4_hdr_rq(request_queue_t *q, struct request *rq, | 183 | static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, |
184 | struct sg_io_v4 *hdr, int has_write_perm) | 184 | struct sg_io_v4 *hdr, int has_write_perm) |
185 | { | 185 | { |
186 | memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */ | 186 | memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */ |
@@ -214,7 +214,7 @@ static int blk_fill_sgv4_hdr_rq(request_queue_t *q, struct request *rq, | |||
214 | * Check if sg_io_v4 from user is allowed and valid | 214 | * Check if sg_io_v4 from user is allowed and valid |
215 | */ | 215 | */ |
216 | static int | 216 | static int |
217 | bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw) | 217 | bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw) |
218 | { | 218 | { |
219 | int ret = 0; | 219 | int ret = 0; |
220 | 220 | ||
@@ -250,7 +250,7 @@ bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw) | |||
250 | static struct request * | 250 | static struct request * |
251 | bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) | 251 | bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) |
252 | { | 252 | { |
253 | request_queue_t *q = bd->queue; | 253 | struct request_queue *q = bd->queue; |
254 | struct request *rq, *next_rq = NULL; | 254 | struct request *rq, *next_rq = NULL; |
255 | int ret, rw; | 255 | int ret, rw; |
256 | unsigned int dxfer_len; | 256 | unsigned int dxfer_len; |
@@ -345,7 +345,7 @@ static void bsg_rq_end_io(struct request *rq, int uptodate) | |||
345 | * do final setup of a 'bc' and submit the matching 'rq' to the block | 345 | * do final setup of a 'bc' and submit the matching 'rq' to the block |
346 | * layer for io | 346 | * layer for io |
347 | */ | 347 | */ |
348 | static void bsg_add_command(struct bsg_device *bd, request_queue_t *q, | 348 | static void bsg_add_command(struct bsg_device *bd, struct request_queue *q, |
349 | struct bsg_command *bc, struct request *rq) | 349 | struct bsg_command *bc, struct request *rq) |
350 | { | 350 | { |
351 | rq->sense = bc->sense; | 351 | rq->sense = bc->sense; |
@@ -611,7 +611,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf, | |||
611 | bc = NULL; | 611 | bc = NULL; |
612 | ret = 0; | 612 | ret = 0; |
613 | while (nr_commands) { | 613 | while (nr_commands) { |
614 | request_queue_t *q = bd->queue; | 614 | struct request_queue *q = bd->queue; |
615 | 615 | ||
616 | bc = bsg_alloc_command(bd); | 616 | bc = bsg_alloc_command(bd); |
617 | if (IS_ERR(bc)) { | 617 | if (IS_ERR(bc)) { |