block: make rq->cmd_flags be 64-bit

We have officially run out of flags in a 32-bit space. Extend it
to 64-bit even on 32-bit archs.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 0a00e4ecf87cae37a3d310c8dfd32869ac24c161..213e9f01c6277ca784299510e882d9a428ef5fd9 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -174,9 +174,9 @@ void blk_dump_rq_flags(struct request *rq, char *msg)
 {
        int bit;
 
 {
        int bit;
 

-       printk(KERN_INFO "%s: dev %s: type=%x, flags=%x\n", msg,
+       printk(KERN_INFO "%s: dev %s: type=%x, flags=%llx\n", msg,

                rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->cmd_type,
                rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->cmd_type,

-               rq->cmd_flags);
+               (unsigned long long) rq->cmd_flags);

 
        printk(KERN_INFO "  sector %llu, nr/cnr %u/%u\n",
               (unsigned long long)blk_rq_pos(rq),
 
        printk(KERN_INFO "  sector %llu, nr/cnr %u/%u\n",
               (unsigned long long)blk_rq_pos(rq),

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 04ceb7e2fadd6ca075d20ecd844c39bf1da07ff3..000abe2f105c60f06d5fac31a2a4889cddd22b15 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -2886,9 +2886,9 @@ static void do_fd_request(struct request_queue *q)
                return;
 
        if (WARN(atomic_read(&usage_count) == 0,
                return;
 
        if (WARN(atomic_read(&usage_count) == 0,

-                "warning: usage count=0, current_req=%p sect=%ld type=%x flags=%x\n",
+                "warning: usage count=0, current_req=%p sect=%ld type=%x flags=%llx\n",

                 current_req, (long)blk_rq_pos(current_req), current_req->cmd_type,
                 current_req, (long)blk_rq_pos(current_req), current_req->cmd_type,

-                current_req->cmd_flags))
+                (unsigned long long) current_req->cmd_flags))

                return;
 
        if (test_and_set_bit(0, &fdc_busy)) {
                return;
 
        if (test_and_set_bit(0, &fdc_busy)) {

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e62d17d41d4e7b84ddf7469194aa0c63d541d59d..dae6133a538d967d0285730c0228c5bbd6f02872 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1002,7 +1002,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                SCpnt->cmnd[0] = READ_6;
                SCpnt->sc_data_direction = DMA_FROM_DEVICE;
        } else {
                SCpnt->cmnd[0] = READ_6;
                SCpnt->sc_data_direction = DMA_FROM_DEVICE;
        } else {

-               scmd_printk(KERN_ERR, SCpnt, "Unknown command %x\n", rq->cmd_flags);
+               scmd_printk(KERN_ERR, SCpnt, "Unknown command %llx\n", (unsigned long long) rq->cmd_flags);

                goto out;
        }
 
                goto out;
        }
 

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index fa1abeb45b7602a4f0c1a4098f05f63d7a075281..c26801e1478863d35bd3426554d30ae956f8b4f0 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -181,16 +181,16 @@ enum rq_flag_bits {
        __REQ_NR_BITS,          /* stops here */
 };
 
        __REQ_NR_BITS,          /* stops here */
 };
 

-#define REQ_WRITE              (1 << __REQ_WRITE)
-#define REQ_FAILFAST_DEV       (1 << __REQ_FAILFAST_DEV)
-#define REQ_FAILFAST_TRANSPORT (1 << __REQ_FAILFAST_TRANSPORT)
-#define REQ_FAILFAST_DRIVER    (1 << __REQ_FAILFAST_DRIVER)
-#define REQ_SYNC               (1 << __REQ_SYNC)
-#define REQ_META               (1 << __REQ_META)
-#define REQ_PRIO               (1 << __REQ_PRIO)
-#define REQ_DISCARD            (1 << __REQ_DISCARD)
-#define REQ_WRITE_SAME         (1 << __REQ_WRITE_SAME)
-#define REQ_NOIDLE             (1 << __REQ_NOIDLE)
+#define REQ_WRITE              (1ULL << __REQ_WRITE)
+#define REQ_FAILFAST_DEV       (1ULL << __REQ_FAILFAST_DEV)
+#define REQ_FAILFAST_TRANSPORT (1ULL << __REQ_FAILFAST_TRANSPORT)
+#define REQ_FAILFAST_DRIVER    (1ULL << __REQ_FAILFAST_DRIVER)
+#define REQ_SYNC               (1ULL << __REQ_SYNC)
+#define REQ_META               (1ULL << __REQ_META)
+#define REQ_PRIO               (1ULL << __REQ_PRIO)
+#define REQ_DISCARD            (1ULL << __REQ_DISCARD)
+#define REQ_WRITE_SAME         (1ULL << __REQ_WRITE_SAME)
+#define REQ_NOIDLE             (1ULL << __REQ_NOIDLE)

 
 #define REQ_FAILFAST_MASK \
        (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)
 
 #define REQ_FAILFAST_MASK \
        (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)


@@ -206,28 +206,28 @@ enum rq_flag_bits {
 #define REQ_NOMERGE_FLAGS \
        (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA)
 
 #define REQ_NOMERGE_FLAGS \
        (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA)
 

-#define REQ_RAHEAD             (1 << __REQ_RAHEAD)
-#define REQ_THROTTLED          (1 << __REQ_THROTTLED)
-
-#define REQ_SORTED             (1 << __REQ_SORTED)
-#define REQ_SOFTBARRIER                (1 << __REQ_SOFTBARRIER)
-#define REQ_FUA                        (1 << __REQ_FUA)
-#define REQ_NOMERGE            (1 << __REQ_NOMERGE)
-#define REQ_STARTED            (1 << __REQ_STARTED)
-#define REQ_DONTPREP           (1 << __REQ_DONTPREP)
-#define REQ_QUEUED             (1 << __REQ_QUEUED)
-#define REQ_ELVPRIV            (1 << __REQ_ELVPRIV)
-#define REQ_FAILED             (1 << __REQ_FAILED)
-#define REQ_QUIET              (1 << __REQ_QUIET)
-#define REQ_PREEMPT            (1 << __REQ_PREEMPT)
-#define REQ_ALLOCED            (1 << __REQ_ALLOCED)
-#define REQ_COPY_USER          (1 << __REQ_COPY_USER)
-#define REQ_FLUSH              (1 << __REQ_FLUSH)
-#define REQ_FLUSH_SEQ          (1 << __REQ_FLUSH_SEQ)
-#define REQ_IO_STAT            (1 << __REQ_IO_STAT)
-#define REQ_MIXED_MERGE                (1 << __REQ_MIXED_MERGE)
-#define REQ_SECURE             (1 << __REQ_SECURE)
-#define REQ_KERNEL             (1 << __REQ_KERNEL)
-#define REQ_PM                 (1 << __REQ_PM)
+#define REQ_RAHEAD             (1ULL << __REQ_RAHEAD)
+#define REQ_THROTTLED          (1ULL << __REQ_THROTTLED)
+
+#define REQ_SORTED             (1ULL << __REQ_SORTED)
+#define REQ_SOFTBARRIER                (1ULL << __REQ_SOFTBARRIER)
+#define REQ_FUA                        (1ULL << __REQ_FUA)
+#define REQ_NOMERGE            (1ULL << __REQ_NOMERGE)
+#define REQ_STARTED            (1ULL << __REQ_STARTED)
+#define REQ_DONTPREP           (1ULL << __REQ_DONTPREP)
+#define REQ_QUEUED             (1ULL << __REQ_QUEUED)
+#define REQ_ELVPRIV            (1ULL << __REQ_ELVPRIV)
+#define REQ_FAILED             (1ULL << __REQ_FAILED)
+#define REQ_QUIET              (1ULL << __REQ_QUIET)
+#define REQ_PREEMPT            (1ULL << __REQ_PREEMPT)
+#define REQ_ALLOCED            (1ULL << __REQ_ALLOCED)
+#define REQ_COPY_USER          (1ULL << __REQ_COPY_USER)
+#define REQ_FLUSH              (1ULL << __REQ_FLUSH)
+#define REQ_FLUSH_SEQ          (1ULL << __REQ_FLUSH_SEQ)
+#define REQ_IO_STAT            (1ULL << __REQ_IO_STAT)
+#define REQ_MIXED_MERGE                (1ULL << __REQ_MIXED_MERGE)
+#define REQ_SECURE             (1ULL << __REQ_SECURE)
+#define REQ_KERNEL             (1ULL << __REQ_KERNEL)
+#define REQ_PM                 (1ULL << __REQ_PM)

 
 #endif /* __LINUX_BLK_TYPES_H */
 
 #endif /* __LINUX_BLK_TYPES_H */

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0e6f765aa1f5adf3acbf54e27cea6fbe495de1cb..f5c7596c93ddb4e3f01f0a57db5ef90ae0e3a7c7 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -99,7 +99,7 @@ struct request {
 
        struct request_queue *q;
 
 
        struct request_queue *q;
 

-       unsigned int cmd_flags;
+       u64 cmd_flags;

        enum rq_cmd_type_bits cmd_type;
        unsigned long atomic_flags;
 
        enum rq_cmd_type_bits cmd_type;
        unsigned long atomic_flags;
 


@@ -570,7 +570,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
 
 #define list_entry_rq(ptr)     list_entry((ptr), struct request, queuelist)
 
 
 #define list_entry_rq(ptr)     list_entry((ptr), struct request, queuelist)
 

-#define rq_data_dir(rq)                ((rq)->cmd_flags & 1)
+#define rq_data_dir(rq)                (((rq)->cmd_flags & 1) != 0)

 
 static inline unsigned int blk_queue_cluster(struct request_queue *q)
 {
 
 static inline unsigned int blk_queue_cluster(struct request_queue *q)
 {