diff options
author | Christoph Hellwig <hch@lst.de> | 2010-08-07 12:17:56 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:17:56 -0400 |
commit | 33659ebbae262228eef4e0fe990f393d1f0ed941 (patch) | |
tree | fcb537f09359c8dad3a6f6e16dc4319562dc42cc /drivers/staging/hv/blkvsc_drv.c | |
parent | 7e005f79791dcd58436c88ded4a7f5aed1b82147 (diff) |
block: remove wrappers for request type/flags
Remove all the trivial wrappers for the cmd_type and cmd_flags fields in
struct requests. This allows much easier grepping for different request
types instead of unwinding through macros.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/staging/hv/blkvsc_drv.c')
-rw-r--r-- | drivers/staging/hv/blkvsc_drv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 61bd0be5fb1..a9aff90e58e 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c | |||
@@ -823,7 +823,8 @@ static void blkvsc_init_rw(struct blkvsc_request *blkvsc_req) | |||
823 | blkvsc_req->cmnd[0] = READ_16; | 823 | blkvsc_req->cmnd[0] = READ_16; |
824 | } | 824 | } |
825 | 825 | ||
826 | blkvsc_req->cmnd[1] |= blk_fua_rq(blkvsc_req->req) ? 0x8 : 0; | 826 | blkvsc_req->cmnd[1] |= |
827 | (blkvsc_req->req->cmd_flags & REQ_FUA) ? 0x8 : 0; | ||
827 | 828 | ||
828 | *(unsigned long long *)&blkvsc_req->cmnd[2] = | 829 | *(unsigned long long *)&blkvsc_req->cmnd[2] = |
829 | cpu_to_be64(blkvsc_req->sector_start); | 830 | cpu_to_be64(blkvsc_req->sector_start); |
@@ -839,7 +840,8 @@ static void blkvsc_init_rw(struct blkvsc_request *blkvsc_req) | |||
839 | blkvsc_req->cmnd[0] = READ_10; | 840 | blkvsc_req->cmnd[0] = READ_10; |
840 | } | 841 | } |
841 | 842 | ||
842 | blkvsc_req->cmnd[1] |= blk_fua_rq(blkvsc_req->req) ? 0x8 : 0; | 843 | blkvsc_req->cmnd[1] |= |
844 | (blkvsc_req->req->cmd_flags & REQ_FUA) ? 0x8 : 0; | ||
843 | 845 | ||
844 | *(unsigned int *)&blkvsc_req->cmnd[2] = | 846 | *(unsigned int *)&blkvsc_req->cmnd[2] = |
845 | cpu_to_be32(blkvsc_req->sector_start); | 847 | cpu_to_be32(blkvsc_req->sector_start); |
@@ -1286,7 +1288,7 @@ static void blkvsc_request(struct request_queue *queue) | |||
1286 | DPRINT_DBG(BLKVSC_DRV, "- req %p\n", req); | 1288 | DPRINT_DBG(BLKVSC_DRV, "- req %p\n", req); |
1287 | 1289 | ||
1288 | blkdev = req->rq_disk->private_data; | 1290 | blkdev = req->rq_disk->private_data; |
1289 | if (blkdev->shutting_down || !blk_fs_request(req) || | 1291 | if (blkdev->shutting_down || req->cmd_type != REQ_TYPE_FS || |
1290 | blkdev->media_not_present) { | 1292 | blkdev->media_not_present) { |
1291 | __blk_end_request_cur(req, 0); | 1293 | __blk_end_request_cur(req, 0); |
1292 | continue; | 1294 | continue; |