summaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2013-05-23 12:25:08 +0200
committerJens Axboe <axboe@kernel.dk>2013-10-25 11:55:59 +0100
commit5953316dbf90067ebdeca626c34488bc166b73a8 (patch)
tree730871975e089bf4a53e8625ac8a5198fd678c8d /drivers/block/floppy.c
parentc84a83e2aaab02a5ca64a982aa55342784934479 (diff)
downloadblackbird-op-linux-5953316dbf90067ebdeca626c34488bc166b73a8.tar.gz
blackbird-op-linux-5953316dbf90067ebdeca626c34488bc166b73a8.zip
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>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r--drivers/block/floppy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 04ceb7e2fadd..000abe2f105c 100644
--- 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,
- "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->cmd_flags))
+ (unsigned long long) current_req->cmd_flags))
return;
if (test_and_set_bit(0, &fdc_busy)) {
OpenPOWER on IntegriCloud