Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6.git] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index 12c287b986256ead85b2ab1fae3eceabe75070e0..d60eee54940554f9c168c22c7a722900be84595b 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -31,7 +31,7 @@
 #define BSG_VERSION    "0.4"
 
 struct bsg_device {
 #define BSG_VERSION    "0.4"
 
 struct bsg_device {

-       request_queue_t *queue;
+       struct request_queue *queue;

        spinlock_t lock;
        struct list_head busy_list;
        struct list_head done_list;
        spinlock_t lock;
        struct list_head busy_list;
        struct list_head done_list;


@@ -172,7 +172,7 @@ unlock:
        return ret;
 }
 
        return ret;
 }
 

-static int blk_fill_sgv4_hdr_rq(request_queue_t *q, struct request *rq,
+static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,

                                struct sg_io_v4 *hdr, int has_write_perm)
 {
        memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
                                struct sg_io_v4 *hdr, int has_write_perm)
 {
        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,
  * Check if sg_io_v4 from user is allowed and valid
  */
 static int
  * Check if sg_io_v4 from user is allowed and valid
  */
 static int

-bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw)
+bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw)

 {
        int ret = 0;
 
 {
        int ret = 0;
 


@@ -242,7 +242,7 @@ bsg_validate_sgv4_hdr(request_queue_t *q, struct sg_io_v4 *hdr, int *rw)
 static struct request *
 bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr)
 {
 static struct request *
 bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr)
 {

-       request_queue_t *q = bd->queue;
+       struct request_queue *q = bd->queue;

        struct request *rq, *next_rq = NULL;
        int ret, rw;
        unsigned int dxfer_len;
        struct request *rq, *next_rq = NULL;
        int ret, rw;
        unsigned int dxfer_len;


@@ -337,7 +337,7 @@ static void bsg_rq_end_io(struct request *rq, int uptodate)
  * do final setup of a 'bc' and submit the matching 'rq' to the block
  * layer for io
  */
  * do final setup of a 'bc' and submit the matching 'rq' to the block
  * layer for io
  */

-static void bsg_add_command(struct bsg_device *bd, request_queue_t *q,
+static void bsg_add_command(struct bsg_device *bd, struct request_queue *q,

                            struct bsg_command *bc, struct request *rq)
 {
        rq->sense = bc->sense;
                            struct bsg_command *bc, struct request *rq)
 {
        rq->sense = bc->sense;


@@ -603,7 +603,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf,
        bc = NULL;
        ret = 0;
        while (nr_commands) {
        bc = NULL;
        ret = 0;
        while (nr_commands) {

-               request_queue_t *q = bd->queue;
+               struct request_queue *q = bd->queue;

 
                bc = bsg_alloc_command(bd);
                if (IS_ERR(bc)) {
 
                bc = bsg_alloc_command(bd);
                if (IS_ERR(bc)) {