block: remove wrappers for request type/flags
PATCH 1/2 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 <[email protected]>
block/blk-barrier.c +4 -3
@@ -79,7 +79,7 @@ unsigned blk_ordered_req_seq(struct requ* * http://thread.gmane.org/gmane.linux.kernel/537473 */ -if (!blk_fs_request (rq)) +if (rq->cmd_type !=REQ_TYPE_FS )return QUEUE_ORDSEQ_DRAIN ; if ((rq->cmd_flags & REQ_ORDERED_COLOR) ==
@@ -236,7 +236,8 @@ static inline bool start_ordered(structbool blk_do_ordered (struct request_queue *q,struct request **rqp) {struct request *rq = *rqp; -const int is_barrier =blk_fs_request (rq) &&blk_barrier_rq (rq); +const int is_barrier = rq->cmd_type ==REQ_TYPE_FS && + (rq->cmd_flags &REQ_HARDBARRIER );if (!q->ordseq) {if (!is_barrier)
@@ -261,7 +262,7 @@ bool blk_do_ordered(struct request_queue*/ /* Special requests are not subject to ordering rules. */ -if (!blk_fs_request (rq) && +if (rq->cmd_type !=REQ_TYPE_FS && rq != &q->pre_flush_rq && rq != &q->post_flush_rq)return true;
block/blk-core.c +7 -6
@@ -184,7 +184,7 @@ void blk_dump_rq_flags(struct request *rprintk (KERN_INFO " bio %p, biotail %p, buffer %p, len %u\n" , rq->bio, rq->biotail, rq->buffer,blk_rq_bytes (rq)); -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {printk (KERN_INFO " cdb: " );for (bit =0 ; bit <BLK_MAX_CDB ; bit++)printk ("%02x " , rq->cmd[bit]);
@@ -1796,7 +1796,7 @@ struct request *blk_peek_request(struct* sees this request (possibly after * requeueing). Notify IO scheduler. */ -if (blk_sorted_rq (rq)) +if (rq->cmd_flags &REQ_SORTED )elv_activate_rq (q, rq);/*
@@ -1984,10 +1984,11 @@ bool blk_update_request(struct request ** TODO: tj: This is too subtle. It would be better to let * low level drivers do what they see fit. */ -if (blk_fs_request (req)) +if (req->cmd_type ==REQ_TYPE_FS ) req->errors =0 ; -if (error && (blk_fs_request (req) && !(req->cmd_flags &REQ_QUIET ))) { +if (error && req->cmd_type ==REQ_TYPE_FS && + !(req->cmd_flags &REQ_QUIET )) {printk (KERN_ERR "end_request: I/O error, dev %s, sector %llu\n" , req->rq_disk ? req->rq_disk->disk_name :"?" , (unsigned long long )blk_rq_pos (req));
@@ -2074,7 +2075,7 @@ bool blk_update_request(struct request * req->buffer =bio_data (req->bio);/* update sector only for requests with clear definition of sector */ -if (blk_fs_request (req) ||blk_discard_rq (req)) +if (req->cmd_type ==REQ_TYPE_FS || (req->cmd_flags &REQ_DISCARD )) req->__sector += total_bytes >>9 ;/* mixed attributes always follow the first bio */
@@ -2126,7 +2127,7 @@ static void blk_finish_request(struct reBUG_ON (blk_queued_rq (req)); -if (unlikely (laptop_mode) &&blk_fs_request (req)) +if (unlikely (laptop_mode) && req->cmd_type ==REQ_TYPE_FS )laptop_io_completion (&req->q->backing_dev_info);blk_delete_timer (req);
block/blk.h +4 -2
@@ -161,8 +161,10 @@ static inline int blk_cpu_to_group(int c*/ static inline int blk_do_io_stat (struct request *rq) { -return rq->rq_disk &&blk_rq_io_stat (rq) && - (blk_fs_request (rq) ||blk_discard_rq (rq)); +return rq->rq_disk && + (rq->cmd_flags &REQ_IO_STAT ) && + (rq->cmd_type ==REQ_TYPE_FS || + (rq->cmd_flags &REQ_DISCARD )); }#endif
block/cfq-iosched.c +11 -8
@@ -646,9 +646,10 @@ cfq_choose_req(struct cfq_data *cfqd, streturn rq1; else if (rq_is_sync(rq2) && !rq_is_sync(rq1)) return rq2; -if (rq_is_meta (rq1) && !rq_is_meta (rq2)) +if ((rq1->cmd_flags &REQ_RW_META ) && !(rq2->cmd_flags &REQ_RW_META ))return rq1; -else if (rq_is_meta (rq2) && !rq_is_meta (rq1)) +else if ((rq2->cmd_flags &REQ_RW_META ) && + !(rq1->cmd_flags &REQ_RW_META ))return rq2; s1 =blk_rq_pos (rq1);
@@ -1484,7 +1485,7 @@ static void cfq_remove_request(struct re cfqq->cfqd->rq_queued--;blkiocg_update_io_remove_stats (&(RQ_CFQG (rq))->blkg,rq_data_dir (rq),rq_is_sync (rq)); -if (rq_is_meta (rq)) { +if (rq->cmd_flags &REQ_RW_META ) {WARN_ON (!cfqq->meta_pending); cfqq->meta_pending--; }
@@ -3167,7 +3168,7 @@ cfq_should_preempt(struct cfq_data *cfqd* So both queues are sync. Let the new request get disk time if * it's a metadata request and the current queue is doing regular IO. */ -if (rq_is_meta (rq) && !cfqq->meta_pending) +if ((rq->cmd_flags &REQ_RW_META ) && !cfqq->meta_pending)return true;/*
@@ -3221,7 +3222,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, sstruct cfq_io_context *cic =RQ_CIC (rq); cfqd->rq_queued++; -if (rq_is_meta (rq)) +if (rq->cmd_flags &REQ_RW_META ) cfqq->meta_pending++;cfq_update_io_thinktime (cfqd, cic);
@@ -3356,7 +3357,8 @@ static void cfq_completed_request(structunsigned long now; now = jiffies; -cfq_log_cfqq (cfqd, cfqq,"complete rqnoidle %d" , !!rq_noidle (rq)); +cfq_log_cfqq (cfqd, cfqq,"complete rqnoidle %d" , + !!(rq->cmd_flags &REQ_NOIDLE ));cfq_update_hw_tag (cfqd);
@@ -3410,11 +3412,12 @@ static void cfq_completed_request(structcfq_slice_expired (cfqd,1 ); else if (sync && cfqq_empty && !cfq_close_cooperator(cfqd, cfqq)) { - cfqd->noidle_tree_requires_idle |= !rq_noidle (rq); + cfqd->noidle_tree_requires_idle |= + !(rq->cmd_flags &REQ_NOIDLE );/* * Idling is enabled for SYNC_WORKLOAD. * SYNC_NOIDLE_WORKLOAD idles at the end of the tree -* only if we processed at least one !rq_noidle request +* only if we processed at least one !REQ_NOIDLE request */ if (cfqd->serving_type ==SYNC_WORKLOAD || cfqd->noidle_tree_requires_idle
block/elevator.c +10 -6
@@ -428,7 +428,8 @@ void elv_dispatch_sort(struct request_qulist_for_each_prev (entry, &q->queue_head) {struct request *pos =list_entry_rq (entry); -if (blk_discard_rq (rq) !=blk_discard_rq (pos)) +if ((rq->cmd_flags &REQ_DISCARD ) != + (pos->cmd_flags &REQ_DISCARD ))break ;if (rq_data_dir (rq) !=rq_data_dir (pos))break ;
@@ -558,7 +559,7 @@ void elv_requeue_request(struct request_*/ if (blk_account_rq (rq)) { q->in_flight[rq_is_sync (rq)]--; -if (blk_sorted_rq (rq)) +if (rq->cmd_flags &REQ_SORTED )elv_deactivate_rq (q, rq); }
@@ -644,7 +645,8 @@ void elv_insert(struct request_queue *q,break ;case ELEVATOR_INSERT_SORT : -BUG_ON (!blk_fs_request (rq) && !blk_discard_rq (rq)); +BUG_ON (rq->cmd_type !=REQ_TYPE_FS && + !(rq->cmd_flags &REQ_DISCARD )); rq->cmd_flags |=REQ_SORTED ; q->nr_sorted++;if (rq_mergeable (rq)) {
@@ -716,7 +718,7 @@ void __elv_add_request(struct request_qu/* * toggle ordered color */ -if (blk_barrier_rq (rq)) +if (rq->cmd_flags &REQ_HARDBARRIER ) q->ordcolor ^=1 ;/*
@@ -729,7 +731,8 @@ void __elv_add_request(struct request_qu* this request is scheduling boundary, update * end_sector */ -if (blk_fs_request (rq) ||blk_discard_rq (rq)) { +if (rq->cmd_type ==REQ_TYPE_FS || + (rq->cmd_flags &REQ_DISCARD )) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq; }
@@ -843,7 +846,8 @@ void elv_completed_request(struct reques*/ if (blk_account_rq (rq)) { q->in_flight[rq_is_sync (rq)]--; -if (blk_sorted_rq (rq) && e->ops->elevator_completed_req_fn) +if ((rq->cmd_flags &REQ_SORTED ) && + e->ops->elevator_completed_req_fn) e->ops->elevator_completed_req_fn (q, rq); }
drivers/block/osdblk.c +2 -1
@@ -310,7 +310,8 @@ static void osdblk_rq_fn(struct request_break ;/* filter out block requests we don't understand */ -if (!blk_fs_request (rq) && !blk_barrier_rq (rq)) { +if (rq->cmd_type !=REQ_TYPE_FS && + !(rq->cmd_flags &REQ_HARDBARRIER )) {blk_end_request_all (rq,0 );continue ; }
drivers/block/virtio_blk.c +9 -6
@@ -65,13 +65,16 @@ static void blk_done(struct virtqueue *vbreak ; } -if (blk_pc_request (vbr->req)) { +switch (vbr->req->cmd_type) { +case REQ_TYPE_BLOCK_PC : vbr->req->resid_len = vbr->in_hdr.residual; vbr->req->sense_len = vbr->in_hdr.sense_len; vbr->req->errors = vbr->in_hdr.errors; - } -if (blk_special_request (vbr->req)) +break ; +case REQ_TYPE_SPECIAL : vbr->req->errors = (error !=0 ); +break ; + }__blk_end_request_all (vbr->req, error);list_del (&vbr->list);
@@ -123,7 +126,7 @@ static bool do_req(struct request_queueBUG (); } -if (blk_barrier_rq (vbr->req)) +if (vbr->req->cmd_flags &REQ_HARDBARRIER ) vbr->out_hdr.type |=VIRTIO_BLK_T_BARRIER ;sg_set_buf (&vblk->sg[out++], &vbr->out_hdr,sizeof (vbr->out_hdr));
@@ -134,12 +137,12 @@ static bool do_req(struct request_queue* block, and before the normal inhdr we put the sense data and the * inhdr with additional status information before the normal inhdr. */ -if (blk_pc_request (vbr->req)) +if (vbr->req->cmd_type ==REQ_TYPE_BLOCK_PC )sg_set_buf (&vblk->sg[out++], vbr->req->cmd, vbr->req->cmd_len); num =blk_rq_map_sg (q, vbr->req, vblk->sg + out); -if (blk_pc_request (vbr->req)) { +if (vbr->req->cmd_type ==REQ_TYPE_BLOCK_PC ) {sg_set_buf (&vblk->sg[num + out + in++], vbr->req->sense,96 );sg_set_buf (&vblk->sg[num + out + in++], &vbr->in_hdr,sizeof (vbr->in_hdr));
drivers/block/xen-blkfront.c +2 -2
@@ -238,7 +238,7 @@ static int blkif_queue_request(struct re ring_req->operation =rq_data_dir (req) ?BLKIF_OP_WRITE :BLKIF_OP_READ ; -if (blk_barrier_rq (req)) +if (req->cmd_flags &REQ_HARDBARRIER ) ring_req->operation =BLKIF_OP_WRITE_BARRIER ; ring_req->nr_segments =blk_rq_map_sg (req->q, req, info->sg);
@@ -309,7 +309,7 @@ static void do_blkif_request(struct requblk_start_request (req); -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {__blk_end_request_all (req, -EIO );continue ; }
drivers/ide/ide-cd.c +36 -30
222 lines not on this page · raw message
drivers/ide/ide-io.c +4 -4
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(ide_complete_rq);void ide_kill_rq (ide_drive_t *drive,struct request *rq) { -u8 drv_req =blk_special_request (rq) && rq->rq_disk; +u8 drv_req = (rq->cmd_type ==REQ_TYPE_SPECIAL ) && rq->rq_disk;u8 media = drive->media; drive->failed_pc =NULL ;
@@ -145,7 +145,7 @@ void ide_kill_rq(ide_drive_t *drive, str }else {if (media == ide_tape) rq->errors =IDE_DRV_ERROR_GENERAL ; -else if (blk_fs_request (rq) ==0 && rq->errors ==0 ) +else if (rq->cmd_type !=REQ_TYPE_FS && rq->errors ==0 ) rq->errors = -EIO ; }
@@ -307,7 +307,7 @@ static ide_startstop_t start_request (id {ide_startstop_t startstop; -BUG_ON (!blk_rq_started (rq)); +BUG_ON (!(rq->cmd_flags &REQ_STARTED ));#ifdef DEBUG printk("%s: start_request: current=0x%08lx\n",
@@ -353,7 +353,7 @@ static ide_startstop_t start_request (id pm->pm_step == IDE_PM_COMPLETED)ide_complete_pm_rq (drive, rq);return startstop; - }else if (!rq->rq_disk &&blk_special_request (rq)) + }else if (!rq->rq_disk && rq->cmd_type ==REQ_TYPE_SPECIAL ) {/* * TODO: Once all ULDs have been modified to * check for specific op codes rather than
drivers/md/dm.c +5 -5
@@ -792,12 +792,12 @@ static void dm_end_request(struct reques {int rw =rq_data_dir (clone);int run_queue =1 ; -bool is_barrier =blk_barrier_rq (clone); + bool is_barrier = (clone->cmd_flags & REQ_HARDBARRIER)struct dm_rq_target_io *tio = clone->end_io_data;struct mapped_device *md = tio->md;struct request *rq = tio->orig; -if (blk_pc_request (rq) && !is_barrier) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC && !is_barrier) { rq->errors = clone->errors; rq->resid_len = clone->resid_len;
@@ -844,7 +844,7 @@ void dm_requeue_unmapped_request(structstruct request_queue *q = rq->q;unsigned long flags; -if (unlikely (blk_barrier_rq (clone))) { +if (unlikely (clone->cmd_flags &REQ_HARDBARRIER )) {/* * Barrier clones share an original request. * Leave it to dm_end_request(), which handles this special
@@ -943,7 +943,7 @@ static void dm_complete_request(struct rstruct dm_rq_target_io *tio = clone->end_io_data;struct request *rq = tio->orig; -if (unlikely (blk_barrier_rq (clone))) { +if (unlikely (clone->cmd_flags &REQ_HARDBARRIER )) {/* * Barrier clones share an original request. So can't use * softirq_done with the original.
@@ -972,7 +972,7 @@ void dm_kill_unmapped_request(struct reqstruct dm_rq_target_io *tio = clone->end_io_data;struct request *rq = tio->orig; -if (unlikely (blk_barrier_rq (clone))) { +if (unlikely (clone->cmd_flags &REQ_HARDBARRIER )) {/* * Barrier clones share an original request. * Leave it to dm_end_request(), which handles this special
drivers/mtd/mtd_blkdevs.c +2 -2
@@ -73,14 +73,14 @@ static int do_blktrans_request(struct mt buf = req->buffer; -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS )return -EIO ;if (blk_rq_pos (req) +blk_rq_cur_sectors (req) >get_capacity (req->rq_disk))return -EIO ; -if (blk_discard_rq (req)) +if (req->cmd_flags &REQ_DISCARD )return tr->discard (dev, block, nsect);switch (rq_data_dir (req)) {
drivers/scsi/scsi_error.c +5 -5
@@ -307,7 +307,7 @@ static int scsi_check_sense(struct scsi_ (sshdr.asc == 0x04) && (sshdr.ascq == 0x02))return FAILED ; -if (blk_barrier_rq (scmd->request)) +if (scmd->request->cmd_flags &REQ_HARDBARRIER )/* * barrier requests should always retry on UA * otherwise block will get a spurious error
@@ -1318,16 +1318,16 @@ int scsi_noretry_cmd(struct scsi_cmnd *scase DID_OK :break ;case DID_BUS_BUSY : -return blk_failfast_transport (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_TRANSPORT );case DID_PARITY : -return blk_failfast_dev (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_DEV );case DID_ERROR :if (msg_byte (scmd->result) ==COMMAND_COMPLETE &&status_byte (scmd->result) ==RESERVATION_CONFLICT )return 0 ;/* fall through */ case DID_SOFT_ERROR : -return blk_failfast_driver (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_DRIVER ); }switch (status_byte (scmd->result)) {
@@ -1336,7 +1336,7 @@ int scsi_noretry_cmd(struct scsi_cmnd *s* assume caller has checked sense and determinted * the check condition was retryable. */ -return blk_failfast_dev (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_DEV ); }return 0 ;
drivers/scsi/sd.c +6 -6
@@ -485,7 +485,7 @@ static int sd_prep_fn(struct request_que* Discard request come in as REQ_TYPE_FS but we turn them into * block PC requests to make life easier. */ -if (blk_discard_rq (rq)) +if (rq->cmd_flags &REQ_DISCARD ) ret =sd_prepare_discard (rq);if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {
@@ -636,7 +636,7 @@ static int sd_prep_fn(struct request_que SCpnt->cmnd[0 ] =VARIABLE_LENGTH_CMD ; SCpnt->cmnd[7 ] =0x18 ; SCpnt->cmnd[9 ] = (rq_data_dir (rq) ==READ ) ?READ_32 :WRITE_32 ; - SCpnt->cmnd[10 ] = protect | (blk_fua_rq (rq) ?0x8 :0 ); + SCpnt->cmnd[10 ] = protect | ((rq->cmd_flags &REQ_FUA ) ?0x8 :0 );/* LBA */ SCpnt->cmnd[12 ] =sizeof (block) >4 ? (unsigned char ) (block >>56 ) &0xff :0 ;
@@ -661,7 +661,7 @@ static int sd_prep_fn(struct request_que SCpnt->cmnd[31 ] = (unsigned char ) this_count &0xff ; }else if (block >0xffffffff ) { SCpnt->cmnd[0 ] +=READ_16 -READ_6 ; - SCpnt->cmnd[1 ] = protect | (blk_fua_rq (rq) ?0x8 :0 ); + SCpnt->cmnd[1 ] = protect | ((rq->cmd_flags &REQ_FUA ) ?0x8 :0 ); SCpnt->cmnd[2 ] =sizeof (block) >4 ? (unsigned char ) (block >>56 ) &0xff :0 ; SCpnt->cmnd[3 ] =sizeof (block) >4 ? (unsigned char ) (block >>48 ) &0xff :0 ; SCpnt->cmnd[4 ] =sizeof (block) >4 ? (unsigned char ) (block >>40 ) &0xff :0 ;
@@ -682,7 +682,7 @@ static int sd_prep_fn(struct request_que this_count =0xffff ; SCpnt->cmnd[0 ] +=READ_10 -READ_6 ; - SCpnt->cmnd[1 ] = protect | (blk_fua_rq (rq) ?0x8 :0 ); + SCpnt->cmnd[1 ] = protect | ((rq->cmd_flags &REQ_FUA ) ?0x8 :0 ); SCpnt->cmnd[2 ] = (unsigned char ) (block >>24 ) &0xff ; SCpnt->cmnd[3 ] = (unsigned char ) (block >>16 ) &0xff ; SCpnt->cmnd[4 ] = (unsigned char ) (block >>8 ) &0xff ;
@@ -691,7 +691,7 @@ static int sd_prep_fn(struct request_que SCpnt->cmnd[7 ] = (unsigned char ) (this_count >>8 ) &0xff ; SCpnt->cmnd[8 ] = (unsigned char ) this_count &0xff ; }else { -if (unlikely (blk_fua_rq (rq))) { +if (unlikely (rq->cmd_flags &REQ_FUA )) {/* * This happens only if this drive failed * 10byte rw command with ILLEGAL_REQUEST
@@ -1112,7 +1112,7 @@ static unsigned int sd_completed_bytes(su64 bad_lba;int info_valid; -if (!blk_fs_request (scmd->request)) +if (scmd->request->cmd_type !=REQ_TYPE_FS )return 0 ; info_valid = scsi_get_sense_info_fld(scmd->sense_buffer,
drivers/staging/hv/blkvsc_drv.c +5 -3
@@ -823,7 +823,8 @@ static void blkvsc_init_rw(struct blkvsc blkvsc_req->cmnd[0 ] =READ_16 ; } - blkvsc_req->cmnd[1 ] |=blk_fua_rq (blkvsc_req->req) ?0x8 :0 ; + blkvsc_req->cmnd[1 ] |= + (blkvsc_req->req->cmd_flags &REQ_FUA ) ?0x8 :0 ; *(unsigned long long *)&blkvsc_req->cmnd[2 ] =cpu_to_be64 (blkvsc_req->sector_start);
@@ -839,7 +840,8 @@ static void blkvsc_init_rw(struct blkvsc blkvsc_req->cmnd[0 ] =READ_10 ; } - blkvsc_req->cmnd[1 ] |=blk_fua_rq (blkvsc_req->req) ?0x8 :0 ; + blkvsc_req->cmnd[1 ] |= + (blkvsc_req->req->cmd_flags &REQ_FUA ) ?0x8 :0 ; *(unsigned int *)&blkvsc_req->cmnd[2 ] =cpu_to_be32 (blkvsc_req->sector_start);
@@ -1286,7 +1288,7 @@ static void blkvsc_request(struct requesDPRINT_DBG (BLKVSC_DRV ,"- req %p\n" , req); blkdev = req->rq_disk->private_data; -if (blkdev->shutting_down || !blk_fs_request (req) || +if (blkdev->shutting_down || req->cmd_type !=REQ_TYPE_FS || blkdev->media_not_present) {__blk_end_request_cur (req,0 );continue ;
include/linux/blkdev.h +12 -27
@@ -601,33 +601,20 @@ enum { test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) -#define blk_fs_request (rq) ((rq)->cmd_type == REQ_TYPE_FS) -#define blk_pc_request (rq) ((rq)->cmd_type == REQ_TYPE_BLOCK_PC) -#define blk_special_request (rq) ((rq)->cmd_type == REQ_TYPE_SPECIAL) -#define blk_sense_request (rq) ((rq)->cmd_type == REQ_TYPE_SENSE) - -#define blk_failfast_dev (rq) ((rq)->cmd_flags & REQ_FAILFAST_DEV) -#define blk_failfast_transport (rq) ((rq)->cmd_flags & REQ_FAILFAST_TRANSPORT) -#define blk_failfast_driver (rq) ((rq)->cmd_flags & REQ_FAILFAST_DRIVER) -#define blk_noretry_request (rq) (blk_failfast_dev(rq) || \ - blk_failfast_transport(rq) || \ - blk_failfast_driver(rq)) -#define blk_rq_started (rq) ((rq)->cmd_flags & REQ_STARTED) -#define blk_rq_io_stat (rq) ((rq)->cmd_flags & REQ_IO_STAT) -#define blk_rq_quiet (rq) ((rq)->cmd_flags & REQ_QUIET) +#define blk_noretry_request (rq) \ + ((rq)->cmd_flags & (REQ_FAILFAST_DEV|REQ_FAILFAST_TRANSPORT| \ + REQ_FAILFAST_DRIVER)) + +#define blk_account_rq (rq) \ + (((rq)->cmd_flags & REQ_STARTED) && \ + ((rq)->cmd_type == REQ_TYPE_FS || \ + ((rq)->cmd_flags & REQ_DISCARD))) -#define blk_account_rq (rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq))) - -#define blk_pm_suspend_request (rq) ((rq)->cmd_type == REQ_TYPE_PM_SUSPEND) -#define blk_pm_resume_request (rq) ((rq)->cmd_type == REQ_TYPE_PM_RESUME)#define blk_pm_request (rq) \ - (blk_pm_suspend_request(rq) || blk_pm_resume_request(rq)) + ((rq)->cmd_type == REQ_TYPE_PM_SUSPEND || \ + (rq)->cmd_type == REQ_TYPE_PM_RESUME)#define blk_rq_cpu_valid (rq) ((rq)->cpu != -1) -#define blk_sorted_rq (rq) ((rq)->cmd_flags & REQ_SORTED) -#define blk_barrier_rq (rq) ((rq)->cmd_flags & REQ_HARDBARRIER) -#define blk_fua_rq (rq) ((rq)->cmd_flags & REQ_FUA) -#define blk_discard_rq (rq) ((rq)->cmd_flags & REQ_DISCARD)#define blk_bidi_rq (rq) ((rq)->next_rq != NULL)/* rq->queuelist of dequeued request must be list_empty() */ #define blk_queued_rq (rq) (!list_empty(&(rq)->queuelist))
@@ -649,9 +636,6 @@ static inline bool rq_is_sync(struct reqreturn rw_is_sync (rq->cmd_flags); } -#define rq_is_meta (rq) ((rq)->cmd_flags & REQ_RW_META) -#define rq_noidle (rq) ((rq)->cmd_flags & REQ_NOIDLE) -static inline int blk_queue_full (struct request_queue *q,int sync) {if (sync)
@@ -684,7 +668,8 @@ static inline void blk_clear_queue_full( (REQ_NOMERGE | REQ_STARTED | REQ_HARDBARRIER | REQ_SOFTBARRIER)#define rq_mergeable (rq) \ (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \ - (blk_discard_rq(rq) || blk_fs_request((rq)))) + (((rq)->cmd_flags & REQ_DISCARD) || \ + (rq)->cmd_type == REQ_TYPE_FS))/* * q->prep_rq_fn return values
kernel/trace/blktrace.c +5 -5
@@ -661,10 +661,10 @@ static void blk_add_trace_rq(struct requif (likely (!bt))return ; -if (blk_discard_rq (rq)) +if (rq->cmd_flags &REQ_DISCARD ) rw |= (1 <<BIO_RW_DISCARD ); -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) { what |=BLK_TC_ACT (BLK_TC_PC );__blk_add_trace (bt,0 ,blk_rq_bytes (rq), rw, what, rq->errors, rq->cmd_len, rq->cmd);
@@ -925,7 +925,7 @@ void blk_add_driver_data(struct request_if (likely (!bt))return ; -if (blk_pc_request (rq)) +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC )__blk_add_trace (bt,0 ,blk_rq_bytes (rq),0 ,BLK_TA_DRV_DATA , rq->errors, len, data);else
@@ -1730,7 +1730,7 @@ void blk_dump_cmd(char *buf, struct requint len = rq->cmd_len;unsigned char *cmd = rq->cmd; -if (!blk_pc_request (rq)) { +if (rq->cmd_type !=REQ_TYPE_BLOCK_PC ) { buf[0 ] ='\0' ;return ; }
@@ -1779,7 +1779,7 @@ void blk_fill_rwbs_rq(char *rwbs, structint rw = rq->cmd_flags &0x03 ;int bytes; -if (blk_discard_rq (rq)) +if (rq->cmd_flags &REQ_DISCARD ) rw |= (1 <<BIO_RW_DISCARD ); bytes =blk_rq_bytes (rq);
block/blk-exec.c +1 -1
@@ -57,7 +57,7 @@ void blk_execute_rq_nowait(struct reques__elv_add_request (q, rq, where,1 );__generic_unplug_device (q);/* the queue is stopped so it won't be plugged+unplugged */ -if (blk_pm_resume_request (rq)) +if (rq->cmd_type ==REQ_TYPE_PM_RESUME ) q->request_fn (q);spin_unlock_irq (q->queue_lock); }
drivers/block/paride/pd.c +1 -1
@@ -439,7 +439,7 @@ static char *pd_buf; /* buffer for requstatic enum action do_pd_io_start (void ) { -if (blk_special_request (pd_req)) { +if (pd_req->cmd_type ==REQ_TYPE_SPECIAL ) { phase = pd_special;return pd_special (); }
drivers/ide/ide-atapi.c +10 -7
@@ -190,7 +190,7 @@ void ide_prep_sense(ide_drive_t *drive,BUG_ON (sense_len >sizeof (*sense)); -if (blk_sense_request (rq) || drive->sense_rq_armed) +if (rq->cmd_type ==REQ_TYPE_SENSE || drive->sense_rq_armed)return ;memset (sense,0 ,sizeof (*sense));
@@ -307,13 +307,16 @@ EXPORT_SYMBOL_GPL(ide_cd_expiry);int ide_cd_get_xferlen (struct request *rq) { -if (blk_fs_request (rq)) + switch (rq->cmd_type) +case REQ_TYPE_FS :return 32768 ; -else if (blk_sense_request (rq) ||blk_pc_request (rq) || - rq->cmd_type ==REQ_TYPE_ATA_PC ) +case REQ_TYPE_SENSE : +case REQ_TYPE_BLOCK_PC : +case REQ_TYPE_ATA_PC :return blk_rq_bytes (rq); -else +default :return 0 ; + } }EXPORT_SYMBOL_GPL (ide_cd_get_xferlen);
@@ -474,12 +477,12 @@ static ide_startstop_t ide_pc_intr(ide_dif (uptodate ==0 ) drive->failed_pc =NULL ; -if (blk_special_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_SPECIAL ) rq->errors =0 ; error =0 ; }else { -if (blk_fs_request (rq) ==0 && uptodate <=0 ) { +if (req->cmd_type !=REQ_TYPE_FS && uptodate <=0 ) {if (rq->errors ==0 ) rq->errors = -EIO ; }
drivers/ide/ide-eh.c +3 -2
@@ -122,7 +122,7 @@ ide_startstop_t ide_error(ide_drive_t *dreturn ide_stopped;/* retry only "normal" I/O: */ -if (!blk_fs_request (rq)) { +if (rq->cmd_type !=REQ_TYPE_FS ) {if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) {struct ide_cmd *cmd = rq->special;
@@ -146,7 +146,8 @@ static inline void ide_complete_drive_re {struct request *rq = drive->hwif->rq; -if (rq &&blk_special_request (rq) && rq->cmd[0 ] ==REQ_DRIVE_RESET ) { +if (rq && rq->cmd_type ==REQ_TYPE_SPECIAL && + rq->cmd[0 ] ==REQ_DRIVE_RESET ) {if (err <=0 && rq->errors ==0 ) rq->errors = -EIO ;ide_complete_rq (drive, err ? err :0 ,blk_rq_bytes (rq));
drivers/ide/ide-floppy.c +16 -9
@@ -73,7 +73,7 @@ static int ide_floppy_callback(ide_drive drive->failed_pc =NULL ;if (pc->c[0 ] ==GPCMD_READ_10 || pc->c[0 ] ==GPCMD_WRITE_10 || - (rq &&blk_pc_request (rq))) + (rq && rq->cmd_type ==REQ_TYPE_BLOCK_PC )) uptodate =1 ;/* FIXME */ else if (pc->c[0 ] ==GPCMD_REQUEST_SENSE ) {
@@ -98,7 +98,7 @@ static int ide_floppy_callback(ide_drive "Aborting request!\n"); } -if (blk_special_request (rq)) +if (rq->cmd_type ==REQ_TYPE_SPECIAL ) rq->errors = uptodate ?0 :IDE_DRV_ERROR_GENERAL ;return uptodate;
@@ -247,14 +247,16 @@ static ide_startstop_t ide_floppy_do_req }else printk(KERN_ERR PFX "%s: I/O error\n", drive->name); -if (blk_special_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_SPECIAL ) { rq->errors =0 ;ide_complete_rq (drive,0 ,blk_rq_bytes (rq));return ide_stopped; }else goto out_end; } -if (blk_fs_request (rq)) { + +switch (rq->cmd_type) { +case REQ_TYPE_FS :if (((long )blk_rq_pos (rq) % floppy->bs_factor) || (blk_rq_sectors (rq) % floppy->bs_factor)) { printk(KERN_ERR PFX "%s: unsupported r/w rq size\n",
@@ -263,13 +265,18 @@ static ide_startstop_t ide_floppy_do_req } pc = &floppy->queued_pc;idefloppy_create_rw_cmd (drive, pc, rq, (unsigned long )block); - }else if (blk_special_request (rq) ||blk_sense_request (rq)) { +break ; +case REQ_TYPE_SPECIAL : +case REQ_TYPE_SENSE : pc = (struct ide_atapi_pc *)rq->special; - }else if (blk_pc_request (rq)) { +break ; +case REQ_TYPE_BLOCK_PC : pc = &floppy->queued_pc;idefloppy_blockpc_cmd (floppy, pc, rq); - }else +break ; +default :BUG (); + }ide_prep_sense (drive, rq);
@@ -280,7 +287,7 @@ static ide_startstop_t ide_floppy_do_req cmd.rq = rq; -if (blk_fs_request (rq) ||blk_rq_bytes (rq)) { +if (rq->cmd_type ==REQ_TYPE_FS ||blk_rq_bytes (rq)) {ide_init_sg_cmd (&cmd,blk_rq_bytes (rq));ide_map_sg (drive, &cmd); }
@@ -290,7 +297,7 @@ static ide_startstop_t ide_floppy_do_reqreturn ide_floppy_issue_pc (drive, &cmd, pc); out_end: drive->failed_pc =NULL ; -if (blk_fs_request (rq) ==0 && rq->errors ==0 ) +if (rq->cmd_type !=REQ_TYPE_FS && rq->errors ==0 ) rq->errors = -EIO ;ide_complete_rq (drive, -EIO ,blk_rq_bytes (rq));return ide_stopped;
drivers/ide/ide-pm.c +4 -4
@@ -191,10 +191,10 @@ void ide_complete_pm_rq(ide_drive_t *dri#ifdef DEBUG_PM printk ("%s: completing PM request, %s\n" , drive->name, -blk_pm_suspend_request (rq) ?"suspend" :"resume" ); + (rq->cmd_type ==REQ_TYPE_PM_SUSPEND ) ?"suspend" :"resume" );#endif spin_lock_irqsave (q->queue_lock, flags); -if (blk_pm_suspend_request (rq)) +if (rq->cmd_type ==REQ_TYPE_PM_SUSPEND )blk_stop_queue (q);else drive->dev_flags &= ~IDE_DFLAG_BLOCKED ;
@@ -210,11 +210,11 @@ void ide_check_pm_state(ide_drive_t *dri {struct request_pm_state *pm = rq->special; -if (blk_pm_suspend_request (rq) && +if (rq->cmd_type ==REQ_TYPE_PM_SUSPEND && pm->pm_step ==IDE_PM_START_SUSPEND )/* Mark drive blocked when starting the suspend sequence. */ drive->dev_flags |=IDE_DFLAG_BLOCKED ; -else if (blk_pm_resume_request (rq) && +else if (rq->cmd_type ==REQ_TYPE_PM_RESUME && pm->pm_step ==IDE_PM_START_RESUME ) {/* * The first thing we do on wakeup is to wait for BSY bit to
drivers/ide/ide-tape.c +2 -1
@@ -577,7 +577,8 @@ static ide_startstop_t idetape_do_reques rq->cmd[0 ], (unsigned long long )blk_rq_pos (rq), blk_rq_sectors(rq)); -BUG_ON (!(blk_special_request (rq) ||blk_sense_request (rq))); +BUG_ON (!(rq->cmd_type ==REQ_TYPE_SPECIAL || + rq->cmd_type ==REQ_TYPE_SENSE ));/* Retry a failed packet command */ if (drive->failed_pc && drive->pc->c[0 ] ==REQUEST_SENSE ) {
block/blk-merge.c +2 -2
@@ -226,7 +226,7 @@ int ll_back_merge_fn(struct request_queu {unsigned short max_sectors; -if (unlikely (blk_pc_request (req))) +if (unlikely (req->cmd_type ==REQ_TYPE_BLOCK_PC )) max_sectors =queue_max_hw_sectors (q);else max_sectors =queue_max_sectors (q);
@@ -250,7 +250,7 @@ int ll_front_merge_fn(struct request_que {unsigned short max_sectors; -if (unlikely (blk_pc_request (req))) +if (unlikely (req->cmd_type ==REQ_TYPE_BLOCK_PC )) max_sectors =queue_max_hw_sectors (q);else max_sectors =queue_max_sectors (q);
drivers/ata/libata-scsi.c +1 -1
@@ -1111,7 +1111,7 @@ static void ata_scsi_sdev_config(struct*/ static int atapi_drain_needed (struct request *rq) { -if (likely (!blk_pc_request (rq))) +if (likely (rq->cmd_type !=REQ_TYPE_BLOCK_PC ))return 0 ;if (!blk_rq_bytes (rq) || (rq->cmd_flags &REQ_RW ))
drivers/block/cciss.c +30 -19
156 lines not on this page · raw message
drivers/block/hd.c +1 -1
@@ -627,7 +627,7 @@ repeat:req_data_dir (req) ==READ ?"read" :"writ" , cyl, head, sec, nsect, req->buffer);#endif -if (blk_fs_request (req)) { +if (req->cmd_type ==REQ_TYPE_FS ) {switch (rq_data_dir (req)) {case READ : hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_READ,
drivers/block/mg_disk.c +2 -2
@@ -670,7 +670,7 @@ static void mg_request_poll(struct requebreak ; } -if (unlikely (!blk_fs_request (host->req))) { +if (unlikely (host->req->cmd_type !=REQ_TYPE_FS )) {mg_end_request_cur (host, -EIO );continue ; }
@@ -756,7 +756,7 @@ static void mg_request(struct request_qucontinue ; } -if (unlikely (!blk_fs_request (req))) { +if (unlikely (req->cmd_type !=REQ_TYPE_FS )) {mg_end_request_cur (host, -EIO );continue ; }
drivers/block/nbd.c +1 -1
@@ -448,7 +448,7 @@ static void nbd_clear_que(struct nbd_devstatic void nbd_handle_req (struct nbd_device *lo,struct request *req) { -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS ) goto error_out;nbd_cmd (req) =NBD_CMD_READ ;
drivers/block/ps3disk.c +1 -1
@@ -196,7 +196,7 @@ static void ps3disk_do_request(struct psdev_dbg (&dev->sbd.core,"%s:%u\n" , __func__, __LINE__);while ((req =blk_fetch_request (q))) { -if (blk_fs_request (req)) { +if (req->cmd_type ==REQ_TYPE_FS ) {if (ps3disk_submit_request_sg (dev, req))break ; } else if (req->cmd_type == REQ_TYPE_LINUX_BLOCK &&
drivers/block/ub.c +4 -4
@@ -648,7 +648,7 @@ static int ub_request_fn_1(struct ub_lunreturn 0 ; } -if (lun->changed && !blk_pc_request (rq)) { +if (lun->changed && rq->cmd_type !=REQ_TYPE_BLOCK_PC )blk_start_request (rq);ub_end_rq (rq,SAM_STAT_CHECK_CONDITION );return 0 ;
@@ -684,7 +684,7 @@ static int ub_request_fn_1(struct ub_lun } urq->nsg = n_elem; -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {ub_cmd_build_packet (sc, lun, cmd, urq); }else {ub_cmd_build_block (sc, lun, cmd, urq);
@@ -781,7 +781,7 @@ static void ub_rw_cmd_done(struct ub_dev rq = urq->rq;if (cmd->error ==0 ) { -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {if (cmd->act_len >= rq->resid_len) rq->resid_len =0 ;else
@@ -795,7 +795,7 @@ static void ub_rw_cmd_done(struct ub_dev } } }else { -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {/* UB_SENSE_SIZE is smaller than SCSI_SENSE_BUFFERSIZE */ memcpy (rq->sense, sc->top_sense,UB_SENSE_SIZE ); rq->sense_len =UB_SENSE_SIZE ;
drivers/block/viodasd.c +1 -1
@@ -361,7 +361,7 @@ static void do_viodasd_request(struct reif (req ==NULL )return ;/* check that request contains a valid command */ -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {viodasd_end_request (req, -EIO ,blk_rq_sectors (req));continue ; }
drivers/block/xd.c +1 -1
@@ -322,7 +322,7 @@ static void do_xd_request (struct requesint res = -EIO ;int retry; -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS ) { goto done;if (block + count >get_capacity (req->rq_disk)) goto done;
drivers/block/xsysace.c +1 -1
@@ -465,7 +465,7 @@ struct request *ace_get_next_request(strstruct request *req;while ((req =blk_peek_request (q)) !=NULL ) { -if (blk_fs_request (req)) +if (req->cmd_type ==REQ_TYPE_FS )break ;blk_start_request (req);__blk_end_request_all (req, -EIO );
drivers/cdrom/gdrom.c +1 -1
@@ -643,7 +643,7 @@ static void gdrom_request(struct requeststruct request *req;while ((req =blk_fetch_request (rq)) !=NULL ) { -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {printk (KERN_DEBUG "GDROM: Non-fs request ignored\n" );__blk_end_request_all (req, -EIO );continue ;
drivers/cdrom/viocd.c +1 -1
@@ -298,7 +298,7 @@ static void do_viocd_request(struct requstruct request *req;while ((rwreq ==0 ) && ((req =blk_fetch_request (q)) !=NULL )) { -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS )__blk_end_request_all (req, -EIO );else if (send_request (req) <0 ) { printk(VIOCD_KERN_WARNING
drivers/ide/ide-disk.c +1 -1
@@ -184,7 +184,7 @@ static ide_startstop_t ide_do_rw_disk(idide_hwif_t *hwif = drive->hwif;BUG_ON (drive->dev_flags &IDE_DFLAG_BLOCKED ); -BUG_ON (!blk_fs_request (rq)); +BUG_ON (rq->cmd_type !=REQ_TYPE_FS );ledtrig_ide_activity ();
drivers/memstick/core/mspro_block.c +2 -1
@@ -805,7 +805,8 @@ static void mspro_block_start(struct memstatic int mspro_block_prepare_req (struct request_queue *q,struct request *req) { -if (!blk_fs_request (req) && !blk_pc_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS && + req->cmd_type !=REQ_TYPE_BLOCK_PC ) {blk_dump_rq_flags (req,"MSPro unsupported request" );return BLKPREP_KILL ; }
drivers/message/i2o/i2o_block.c +1 -1
@@ -883,7 +883,7 @@ static void i2o_block_request_fn(structif (!req)break ; -if (blk_fs_request (req)) { +if (req->cmd_type ==REQ_TYPE_FS ) {struct i2o_block_delayed_request *dreq;struct i2o_block_request *ireq = req->special;unsigned int queue_depth;
drivers/mmc/card/queue.c +1 -1
@@ -32,7 +32,7 @@ static int mmc_prep_request(struct reque/* * We only like normal block requests. */ -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {blk_dump_rq_flags (req,"MMC bad request" );return BLKPREP_KILL ; }
drivers/scsi/scsi_lib.c +3 -2
@@ -722,7 +722,7 @@ void scsi_io_completion(struct scsi_cmnd sense_deferred =scsi_sense_is_deferred (&sshdr); } -if (blk_pc_request (req)) {/* SG_IO ioctl from block level */ +if (req->cmd_type ==REQ_TYPE_BLOCK_PC ) {/* SG_IO ioctl from block level */ req->errors = result;if (result) {if (sense_valid && req->sense) {
@@ -757,7 +757,8 @@ void scsi_io_completion(struct scsi_cmnd } } -BUG_ON (blk_bidi_rq (req));/* bidi not support for !blk_pc_request yet */ +/* no bidi support for !REQ_TYPE_BLOCK_PC yet */ +BUG_ON (blk_bidi_rq (req));/* * Next deal with any sectors which we were able to correctly
drivers/scsi/sun3_NCR5380.c +1 -1
@@ -2022,7 +2022,7 @@ static void NCR5380_information_transferif ((count >SUN3_DMA_MINSIZE ) && (sun3_dma_setup_done != cmd)) { -if (blk_fs_request (cmd->request)) { +if (cmd->request->cmd_type ==REQ_TYPE_FS ) {sun3scsi_dma_setup (d, count,rq_data_dir (cmd->request)); sun3_dma_setup_done = cmd;
drivers/scsi/sun3_scsi.c +1 -1
@@ -524,7 +524,7 @@ static inline unsigned long sun3scsi_dma struct scsi_cmnd *cmd, int write_flag) { -if (blk_fs_request (cmd->request)) +if (cmd->request->cmd_type ==REQ_TYPE_FS )return wanted;else return 0 ;
drivers/scsi/sun3_scsi_vme.c +1 -1
@@ -458,7 +458,7 @@ static inline unsigned long sun3scsi_dma struct scsi_cmnd *cmd, int write_flag) { -if (blk_fs_request (cmd->request)) +if (cmd->request->cmd_type ==REQ_TYPE_FS )return wanted;else return 0 ;
include/linux/blktrace_api.h +1 -1
@@ -224,7 +224,7 @@ static inline int blk_trace_init_sysfs(sstatic inline int blk_cmd_buf_len (struct request *rq) { -return blk_pc_request (rq) ? rq->cmd_len *3 :1 ; +return (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? rq->cmd_len *3 :1 ; }extern void blk_dump_cmd (char *buf,struct request *rq);
include/trace/events/block.h +10 -5
@@ -25,8 +25,10 @@ DECLARE_EVENT_CLASS(block_rq_with_error,TP_fast_assign ( __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; - __entry->sector =blk_pc_request (rq) ?0 :blk_rq_pos (rq); - __entry->nr_sector =blk_pc_request (rq) ?0 :blk_rq_sectors (rq); + __entry->sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_pos (rq); + __entry->nr_sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_sectors (rq); __entry->errors = rq->errors;blk_fill_rwbs_rq (__entry->rwbs, rq);
@@ -109,9 +111,12 @@ DECLARE_EVENT_CLASS(block_rq,TP_fast_assign ( __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; - __entry->sector =blk_pc_request (rq) ?0 :blk_rq_pos (rq); - __entry->nr_sector =blk_pc_request (rq) ?0 :blk_rq_sectors (rq); - __entry->bytes =blk_pc_request (rq) ?blk_rq_bytes (rq) :0 ; + __entry->sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_pos (rq); + __entry->nr_sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_sectors (rq); + __entry->bytes = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +blk_rq_bytes (rq) :0 ;blk_fill_rwbs_rq (__entry->rwbs, rq);blk_dump_cmd (__get_str (cmd), rq);
Jens Axboe
maintainerQuoted 3 lines · Christoph Hellwig
Remove all the trivial wrappers for the
cmd_typeandcmd_flagsfields in struct requests. This allows much easier grepping for different request types instead of unwinding through macros.
Agree. I kind of liked it in the beginning, but it really just adds an extra layer of grep or cscope stack when you forget what it checks specifically.
Was this a scripted conversion?
Signature · 1 line
Jens Axboe
Quoted 10 lines · Jens Axboe
Quoted 3 lines · Christoph Hellwig
Remove all the trivial wrappers for the
cmd_typeandcmd_flagsfields in struct requests. This allows much easier grepping for different request types instead of unwinding through macros.Agree. I kind of liked it in the beginning, but it really just adds an extra layer of grep or cscope stack when you forget what it checks specifically.
Was this a scripted conversion?
No. And as you already noticed I sent you the version before fixing up the make allmodconfig fallout. Here's the fixed one:
---
From: Christoph Hellwig <[email protected]>
Subject: [PATCH 1/2] 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 <[email protected]>
block/blk-barrier.c +4 -3
@@ -79,7 +79,7 @@ unsigned blk_ordered_req_seq(struct requ* * http://thread.gmane.org/gmane.linux.kernel/537473 */ -if (!blk_fs_request (rq)) +if (rq->cmd_type !=REQ_TYPE_FS )return QUEUE_ORDSEQ_DRAIN ; if ((rq->cmd_flags & REQ_ORDERED_COLOR) ==
@@ -236,7 +236,8 @@ static inline bool start_ordered(structbool blk_do_ordered (struct request_queue *q,struct request **rqp) {struct request *rq = *rqp; -const int is_barrier =blk_fs_request (rq) &&blk_barrier_rq (rq); +const int is_barrier = rq->cmd_type ==REQ_TYPE_FS && + (rq->cmd_flags &REQ_HARDBARRIER );if (!q->ordseq) {if (!is_barrier)
@@ -261,7 +262,7 @@ bool blk_do_ordered(struct request_queue*/ /* Special requests are not subject to ordering rules. */ -if (!blk_fs_request (rq) && +if (rq->cmd_type !=REQ_TYPE_FS && rq != &q->pre_flush_rq && rq != &q->post_flush_rq)return true;
block/blk-core.c +7 -6
@@ -184,7 +184,7 @@ void blk_dump_rq_flags(struct request *rprintk (KERN_INFO " bio %p, biotail %p, buffer %p, len %u\n" , rq->bio, rq->biotail, rq->buffer,blk_rq_bytes (rq)); -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {printk (KERN_INFO " cdb: " );for (bit =0 ; bit <BLK_MAX_CDB ; bit++)printk ("%02x " , rq->cmd[bit]);
@@ -1796,7 +1796,7 @@ struct request *blk_peek_request(struct* sees this request (possibly after * requeueing). Notify IO scheduler. */ -if (blk_sorted_rq (rq)) +if (rq->cmd_flags &REQ_SORTED )elv_activate_rq (q, rq);/*
@@ -1984,10 +1984,11 @@ bool blk_update_request(struct request ** TODO: tj: This is too subtle. It would be better to let * low level drivers do what they see fit. */ -if (blk_fs_request (req)) +if (req->cmd_type ==REQ_TYPE_FS ) req->errors =0 ; -if (error && (blk_fs_request (req) && !(req->cmd_flags &REQ_QUIET ))) { +if (error && req->cmd_type ==REQ_TYPE_FS && + !(req->cmd_flags &REQ_QUIET )) {printk (KERN_ERR "end_request: I/O error, dev %s, sector %llu\n" , req->rq_disk ? req->rq_disk->disk_name :"?" , (unsigned long long )blk_rq_pos (req));
@@ -2074,7 +2075,7 @@ bool blk_update_request(struct request * req->buffer =bio_data (req->bio);/* update sector only for requests with clear definition of sector */ -if (blk_fs_request (req) ||blk_discard_rq (req)) +if (req->cmd_type ==REQ_TYPE_FS || (req->cmd_flags &REQ_DISCARD )) req->__sector += total_bytes >>9 ;/* mixed attributes always follow the first bio */
@@ -2126,7 +2127,7 @@ static void blk_finish_request(struct reBUG_ON (blk_queued_rq (req)); -if (unlikely (laptop_mode) &&blk_fs_request (req)) +if (unlikely (laptop_mode) && req->cmd_type ==REQ_TYPE_FS )laptop_io_completion (&req->q->backing_dev_info);blk_delete_timer (req);
block/blk.h +4 -2
@@ -161,8 +161,10 @@ static inline int blk_cpu_to_group(int c*/ static inline int blk_do_io_stat (struct request *rq) { -return rq->rq_disk &&blk_rq_io_stat (rq) && - (blk_fs_request (rq) ||blk_discard_rq (rq)); +return rq->rq_disk && + (rq->cmd_flags &REQ_IO_STAT ) && + (rq->cmd_type ==REQ_TYPE_FS || + (rq->cmd_flags &REQ_DISCARD )); }#endif
block/cfq-iosched.c +11 -8
@@ -646,9 +646,10 @@ cfq_choose_req(struct cfq_data *cfqd, streturn rq1; else if (rq_is_sync(rq2) && !rq_is_sync(rq1)) return rq2; -if (rq_is_meta (rq1) && !rq_is_meta (rq2)) +if ((rq1->cmd_flags &REQ_RW_META ) && !(rq2->cmd_flags &REQ_RW_META ))return rq1; -else if (rq_is_meta (rq2) && !rq_is_meta (rq1)) +else if ((rq2->cmd_flags &REQ_RW_META ) && + !(rq1->cmd_flags &REQ_RW_META ))return rq2; s1 =blk_rq_pos (rq1);
@@ -1484,7 +1485,7 @@ static void cfq_remove_request(struct re cfqq->cfqd->rq_queued--;blkiocg_update_io_remove_stats (&(RQ_CFQG (rq))->blkg,rq_data_dir (rq),rq_is_sync (rq)); -if (rq_is_meta (rq)) { +if (rq->cmd_flags &REQ_RW_META ) {WARN_ON (!cfqq->meta_pending); cfqq->meta_pending--; }
@@ -3167,7 +3168,7 @@ cfq_should_preempt(struct cfq_data *cfqd* So both queues are sync. Let the new request get disk time if * it's a metadata request and the current queue is doing regular IO. */ -if (rq_is_meta (rq) && !cfqq->meta_pending) +if ((rq->cmd_flags &REQ_RW_META ) && !cfqq->meta_pending)return true;/*
@@ -3221,7 +3222,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, sstruct cfq_io_context *cic =RQ_CIC (rq); cfqd->rq_queued++; -if (rq_is_meta (rq)) +if (rq->cmd_flags &REQ_RW_META ) cfqq->meta_pending++;cfq_update_io_thinktime (cfqd, cic);
@@ -3356,7 +3357,8 @@ static void cfq_completed_request(structunsigned long now; now = jiffies; -cfq_log_cfqq (cfqd, cfqq,"complete rqnoidle %d" , !!rq_noidle (rq)); +cfq_log_cfqq (cfqd, cfqq,"complete rqnoidle %d" , + !!(rq->cmd_flags &REQ_NOIDLE ));cfq_update_hw_tag (cfqd);
@@ -3410,11 +3412,12 @@ static void cfq_completed_request(structcfq_slice_expired (cfqd,1 ); else if (sync && cfqq_empty && !cfq_close_cooperator(cfqd, cfqq)) { - cfqd->noidle_tree_requires_idle |= !rq_noidle (rq); + cfqd->noidle_tree_requires_idle |= + !(rq->cmd_flags &REQ_NOIDLE );/* * Idling is enabled for SYNC_WORKLOAD. * SYNC_NOIDLE_WORKLOAD idles at the end of the tree -* only if we processed at least one !rq_noidle request +* only if we processed at least one !REQ_NOIDLE request */ if (cfqd->serving_type ==SYNC_WORKLOAD || cfqd->noidle_tree_requires_idle
block/elevator.c +10 -6
@@ -428,7 +428,8 @@ void elv_dispatch_sort(struct request_qulist_for_each_prev (entry, &q->queue_head) {struct request *pos =list_entry_rq (entry); -if (blk_discard_rq (rq) !=blk_discard_rq (pos)) +if ((rq->cmd_flags &REQ_DISCARD ) != + (pos->cmd_flags &REQ_DISCARD ))break ;if (rq_data_dir (rq) !=rq_data_dir (pos))break ;
@@ -558,7 +559,7 @@ void elv_requeue_request(struct request_*/ if (blk_account_rq (rq)) { q->in_flight[rq_is_sync (rq)]--; -if (blk_sorted_rq (rq)) +if (rq->cmd_flags &REQ_SORTED )elv_deactivate_rq (q, rq); }
@@ -644,7 +645,8 @@ void elv_insert(struct request_queue *q,break ;case ELEVATOR_INSERT_SORT : -BUG_ON (!blk_fs_request (rq) && !blk_discard_rq (rq)); +BUG_ON (rq->cmd_type !=REQ_TYPE_FS && + !(rq->cmd_flags &REQ_DISCARD )); rq->cmd_flags |=REQ_SORTED ; q->nr_sorted++;if (rq_mergeable (rq)) {
@@ -716,7 +718,7 @@ void __elv_add_request(struct request_qu/* * toggle ordered color */ -if (blk_barrier_rq (rq)) +if (rq->cmd_flags &REQ_HARDBARRIER ) q->ordcolor ^=1 ;/*
@@ -729,7 +731,8 @@ void __elv_add_request(struct request_qu* this request is scheduling boundary, update * end_sector */ -if (blk_fs_request (rq) ||blk_discard_rq (rq)) { +if (rq->cmd_type ==REQ_TYPE_FS || + (rq->cmd_flags &REQ_DISCARD )) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq; }
@@ -843,7 +846,8 @@ void elv_completed_request(struct reques*/ if (blk_account_rq (rq)) { q->in_flight[rq_is_sync (rq)]--; -if (blk_sorted_rq (rq) && e->ops->elevator_completed_req_fn) +if ((rq->cmd_flags &REQ_SORTED ) && + e->ops->elevator_completed_req_fn) e->ops->elevator_completed_req_fn (q, rq); }
drivers/block/osdblk.c +2 -1
@@ -310,7 +310,8 @@ static void osdblk_rq_fn(struct request_break ;/* filter out block requests we don't understand */ -if (!blk_fs_request (rq) && !blk_barrier_rq (rq)) { +if (rq->cmd_type !=REQ_TYPE_FS && + !(rq->cmd_flags &REQ_HARDBARRIER )) {blk_end_request_all (rq,0 );continue ; }
drivers/block/virtio_blk.c +11 -6
@@ -65,13 +65,18 @@ static void blk_done(struct virtqueue *vbreak ; } -if (blk_pc_request (vbr->req)) { +switch (vbr->req->cmd_type) { +case REQ_TYPE_BLOCK_PC : vbr->req->resid_len = vbr->in_hdr.residual; vbr->req->sense_len = vbr->in_hdr.sense_len; vbr->req->errors = vbr->in_hdr.errors; - } -if (blk_special_request (vbr->req)) +break ; +case REQ_TYPE_SPECIAL : vbr->req->errors = (error !=0 ); +break ; +default : +break ; + }__blk_end_request_all (vbr->req, error);list_del (&vbr->list);
@@ -123,7 +128,7 @@ static bool do_req(struct request_queueBUG (); } -if (blk_barrier_rq (vbr->req)) +if (vbr->req->cmd_flags &REQ_HARDBARRIER ) vbr->out_hdr.type |=VIRTIO_BLK_T_BARRIER ;sg_set_buf (&vblk->sg[out++], &vbr->out_hdr,sizeof (vbr->out_hdr));
@@ -134,12 +139,12 @@ static bool do_req(struct request_queue* block, and before the normal inhdr we put the sense data and the * inhdr with additional status information before the normal inhdr. */ -if (blk_pc_request (vbr->req)) +if (vbr->req->cmd_type ==REQ_TYPE_BLOCK_PC )sg_set_buf (&vblk->sg[out++], vbr->req->cmd, vbr->req->cmd_len); num =blk_rq_map_sg (q, vbr->req, vblk->sg + out); -if (blk_pc_request (vbr->req)) { +if (vbr->req->cmd_type ==REQ_TYPE_BLOCK_PC ) {sg_set_buf (&vblk->sg[num + out + in++], vbr->req->sense,96 );sg_set_buf (&vblk->sg[num + out + in++], &vbr->in_hdr,sizeof (vbr->in_hdr));
drivers/block/xen-blkfront.c +2 -2
@@ -238,7 +238,7 @@ static int blkif_queue_request(struct re ring_req->operation =rq_data_dir (req) ?BLKIF_OP_WRITE :BLKIF_OP_READ ; -if (blk_barrier_rq (req)) +if (req->cmd_flags &REQ_HARDBARRIER ) ring_req->operation =BLKIF_OP_WRITE_BARRIER ; ring_req->nr_segments =blk_rq_map_sg (req->q, req, info->sg);
@@ -309,7 +309,7 @@ static void do_blkif_request(struct requblk_start_request (req); -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {__blk_end_request_all (req, -EIO );continue ; }
drivers/ide/ide-cd.c +36 -30
222 lines not on this page · raw message
drivers/ide/ide-io.c +4 -4
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(ide_complete_rq);void ide_kill_rq (ide_drive_t *drive,struct request *rq) { -u8 drv_req =blk_special_request (rq) && rq->rq_disk; +u8 drv_req = (rq->cmd_type ==REQ_TYPE_SPECIAL ) && rq->rq_disk;u8 media = drive->media; drive->failed_pc =NULL ;
@@ -145,7 +145,7 @@ void ide_kill_rq(ide_drive_t *drive, str }else {if (media == ide_tape) rq->errors =IDE_DRV_ERROR_GENERAL ; -else if (blk_fs_request (rq) ==0 && rq->errors ==0 ) +else if (rq->cmd_type !=REQ_TYPE_FS && rq->errors ==0 ) rq->errors = -EIO ; }
@@ -307,7 +307,7 @@ static ide_startstop_t start_request (id {ide_startstop_t startstop; -BUG_ON (!blk_rq_started (rq)); +BUG_ON (!(rq->cmd_flags &REQ_STARTED ));#ifdef DEBUG printk("%s: start_request: current=0x%08lx\n",
@@ -353,7 +353,7 @@ static ide_startstop_t start_request (id pm->pm_step == IDE_PM_COMPLETED)ide_complete_pm_rq (drive, rq);return startstop; - }else if (!rq->rq_disk &&blk_special_request (rq)) + }else if (!rq->rq_disk && rq->cmd_type ==REQ_TYPE_SPECIAL )/* * TODO: Once all ULDs have been modified to * check for specific op codes rather than
drivers/md/dm.c +5 -5
@@ -792,12 +792,12 @@ static void dm_end_request(struct reques {int rw =rq_data_dir (clone);int run_queue =1 ; -bool is_barrier =blk_barrier_rq (clone); +bool is_barrier = (clone->cmd_flags &REQ_HARDBARRIER );struct dm_rq_target_io *tio = clone->end_io_data;struct mapped_device *md = tio->md;struct request *rq = tio->orig; -if (blk_pc_request (rq) && !is_barrier) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC && !is_barrier) { rq->errors = clone->errors; rq->resid_len = clone->resid_len;
@@ -844,7 +844,7 @@ void dm_requeue_unmapped_request(structstruct request_queue *q = rq->q;unsigned long flags; -if (unlikely (blk_barrier_rq (clone))) { +if (unlikely (clone->cmd_flags &REQ_HARDBARRIER )) {/* * Barrier clones share an original request. * Leave it to dm_end_request(), which handles this special
@@ -943,7 +943,7 @@ static void dm_complete_request(struct rstruct dm_rq_target_io *tio = clone->end_io_data;struct request *rq = tio->orig; -if (unlikely (blk_barrier_rq (clone))) { +if (unlikely (clone->cmd_flags &REQ_HARDBARRIER )) {/* * Barrier clones share an original request. So can't use * softirq_done with the original.
@@ -972,7 +972,7 @@ void dm_kill_unmapped_request(struct reqstruct dm_rq_target_io *tio = clone->end_io_data;struct request *rq = tio->orig; -if (unlikely (blk_barrier_rq (clone))) { +if (unlikely (clone->cmd_flags &REQ_HARDBARRIER )) {/* * Barrier clones share an original request. * Leave it to dm_end_request(), which handles this special
drivers/mtd/mtd_blkdevs.c +2 -2
@@ -73,14 +73,14 @@ static int do_blktrans_request(struct mt buf = req->buffer; -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS )return -EIO ;if (blk_rq_pos (req) +blk_rq_cur_sectors (req) >get_capacity (req->rq_disk))return -EIO ; -if (blk_discard_rq (req)) +if (req->cmd_flags &REQ_DISCARD )return tr->discard (dev, block, nsect);switch (rq_data_dir (req)) {
drivers/scsi/scsi_error.c +5 -5
@@ -307,7 +307,7 @@ static int scsi_check_sense(struct scsi_ (sshdr.asc == 0x04) && (sshdr.ascq == 0x02))return FAILED ; -if (blk_barrier_rq (scmd->request)) +if (scmd->request->cmd_flags &REQ_HARDBARRIER )/* * barrier requests should always retry on UA * otherwise block will get a spurious error
@@ -1318,16 +1318,16 @@ int scsi_noretry_cmd(struct scsi_cmnd *scase DID_OK :break ;case DID_BUS_BUSY : -return blk_failfast_transport (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_TRANSPORT );case DID_PARITY : -return blk_failfast_dev (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_DEV );case DID_ERROR :if (msg_byte (scmd->result) ==COMMAND_COMPLETE &&status_byte (scmd->result) ==RESERVATION_CONFLICT )return 0 ;/* fall through */ case DID_SOFT_ERROR : -return blk_failfast_driver (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_DRIVER ); }switch (status_byte (scmd->result)) {
@@ -1336,7 +1336,7 @@ int scsi_noretry_cmd(struct scsi_cmnd *s* assume caller has checked sense and determinted * the check condition was retryable. */ -return blk_failfast_dev (scmd->request); +return (scmd->request->cmd_flags &REQ_FAILFAST_DEV ); }return 0 ;
drivers/scsi/sd.c +6 -6
@@ -485,7 +485,7 @@ static int sd_prep_fn(struct request_que* Discard request come in as REQ_TYPE_FS but we turn them into * block PC requests to make life easier. */ -if (blk_discard_rq (rq)) +if (rq->cmd_flags &REQ_DISCARD ) ret =sd_prepare_discard (rq);if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {
@@ -636,7 +636,7 @@ static int sd_prep_fn(struct request_que SCpnt->cmnd[0 ] =VARIABLE_LENGTH_CMD ; SCpnt->cmnd[7 ] =0x18 ; SCpnt->cmnd[9 ] = (rq_data_dir (rq) ==READ ) ?READ_32 :WRITE_32 ; - SCpnt->cmnd[10 ] = protect | (blk_fua_rq (rq) ?0x8 :0 ); + SCpnt->cmnd[10 ] = protect | ((rq->cmd_flags &REQ_FUA ) ?0x8 :0 );/* LBA */ SCpnt->cmnd[12 ] =sizeof (block) >4 ? (unsigned char ) (block >>56 ) &0xff :0 ;
@@ -661,7 +661,7 @@ static int sd_prep_fn(struct request_que SCpnt->cmnd[31 ] = (unsigned char ) this_count &0xff ; }else if (block >0xffffffff ) { SCpnt->cmnd[0 ] +=READ_16 -READ_6 ; - SCpnt->cmnd[1 ] = protect | (blk_fua_rq (rq) ?0x8 :0 ); + SCpnt->cmnd[1 ] = protect | ((rq->cmd_flags &REQ_FUA ) ?0x8 :0 ); SCpnt->cmnd[2 ] =sizeof (block) >4 ? (unsigned char ) (block >>56 ) &0xff :0 ; SCpnt->cmnd[3 ] =sizeof (block) >4 ? (unsigned char ) (block >>48 ) &0xff :0 ; SCpnt->cmnd[4 ] =sizeof (block) >4 ? (unsigned char ) (block >>40 ) &0xff :0 ;
@@ -682,7 +682,7 @@ static int sd_prep_fn(struct request_que this_count =0xffff ; SCpnt->cmnd[0 ] +=READ_10 -READ_6 ; - SCpnt->cmnd[1 ] = protect | (blk_fua_rq (rq) ?0x8 :0 ); + SCpnt->cmnd[1 ] = protect | ((rq->cmd_flags &REQ_FUA ) ?0x8 :0 ); SCpnt->cmnd[2 ] = (unsigned char ) (block >>24 ) &0xff ; SCpnt->cmnd[3 ] = (unsigned char ) (block >>16 ) &0xff ; SCpnt->cmnd[4 ] = (unsigned char ) (block >>8 ) &0xff ;
@@ -691,7 +691,7 @@ static int sd_prep_fn(struct request_que SCpnt->cmnd[7 ] = (unsigned char ) (this_count >>8 ) &0xff ; SCpnt->cmnd[8 ] = (unsigned char ) this_count &0xff ; }else { -if (unlikely (blk_fua_rq (rq))) { +if (unlikely (rq->cmd_flags &REQ_FUA )) {/* * This happens only if this drive failed * 10byte rw command with ILLEGAL_REQUEST
@@ -1112,7 +1112,7 @@ static unsigned int sd_completed_bytes(su64 bad_lba;int info_valid; -if (!blk_fs_request (scmd->request)) +if (scmd->request->cmd_type !=REQ_TYPE_FS )return 0 ; info_valid = scsi_get_sense_info_fld(scmd->sense_buffer,
drivers/staging/hv/blkvsc_drv.c +5 -3
@@ -823,7 +823,8 @@ static void blkvsc_init_rw(struct blkvsc blkvsc_req->cmnd[0 ] =READ_16 ; } - blkvsc_req->cmnd[1 ] |=blk_fua_rq (blkvsc_req->req) ?0x8 :0 ; + blkvsc_req->cmnd[1 ] |= + (blkvsc_req->req->cmd_flags &REQ_FUA ) ?0x8 :0 ; *(unsigned long long *)&blkvsc_req->cmnd[2 ] =cpu_to_be64 (blkvsc_req->sector_start);
@@ -839,7 +840,8 @@ static void blkvsc_init_rw(struct blkvsc blkvsc_req->cmnd[0 ] =READ_10 ; } - blkvsc_req->cmnd[1 ] |=blk_fua_rq (blkvsc_req->req) ?0x8 :0 ; + blkvsc_req->cmnd[1 ] |= + (blkvsc_req->req->cmd_flags &REQ_FUA ) ?0x8 :0 ; *(unsigned int *)&blkvsc_req->cmnd[2 ] =cpu_to_be32 (blkvsc_req->sector_start);
@@ -1286,7 +1288,7 @@ static void blkvsc_request(struct requesDPRINT_DBG (BLKVSC_DRV ,"- req %p\n" , req); blkdev = req->rq_disk->private_data; -if (blkdev->shutting_down || !blk_fs_request (req) || +if (blkdev->shutting_down || req->cmd_type !=REQ_TYPE_FS || blkdev->media_not_present) {__blk_end_request_cur (req,0 );continue ;
include/linux/blkdev.h +12 -27
@@ -601,33 +601,20 @@ enum { test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) -#define blk_fs_request (rq) ((rq)->cmd_type == REQ_TYPE_FS) -#define blk_pc_request (rq) ((rq)->cmd_type == REQ_TYPE_BLOCK_PC) -#define blk_special_request (rq) ((rq)->cmd_type == REQ_TYPE_SPECIAL) -#define blk_sense_request (rq) ((rq)->cmd_type == REQ_TYPE_SENSE) - -#define blk_failfast_dev (rq) ((rq)->cmd_flags & REQ_FAILFAST_DEV) -#define blk_failfast_transport (rq) ((rq)->cmd_flags & REQ_FAILFAST_TRANSPORT) -#define blk_failfast_driver (rq) ((rq)->cmd_flags & REQ_FAILFAST_DRIVER) -#define blk_noretry_request (rq) (blk_failfast_dev(rq) || \ - blk_failfast_transport(rq) || \ - blk_failfast_driver(rq)) -#define blk_rq_started (rq) ((rq)->cmd_flags & REQ_STARTED) -#define blk_rq_io_stat (rq) ((rq)->cmd_flags & REQ_IO_STAT) -#define blk_rq_quiet (rq) ((rq)->cmd_flags & REQ_QUIET) +#define blk_noretry_request (rq) \ + ((rq)->cmd_flags & (REQ_FAILFAST_DEV|REQ_FAILFAST_TRANSPORT| \ + REQ_FAILFAST_DRIVER)) + +#define blk_account_rq (rq) \ + (((rq)->cmd_flags & REQ_STARTED) && \ + ((rq)->cmd_type == REQ_TYPE_FS || \ + ((rq)->cmd_flags & REQ_DISCARD))) -#define blk_account_rq (rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq))) - -#define blk_pm_suspend_request (rq) ((rq)->cmd_type == REQ_TYPE_PM_SUSPEND) -#define blk_pm_resume_request (rq) ((rq)->cmd_type == REQ_TYPE_PM_RESUME)#define blk_pm_request (rq) \ - (blk_pm_suspend_request(rq) || blk_pm_resume_request(rq)) + ((rq)->cmd_type == REQ_TYPE_PM_SUSPEND || \ + (rq)->cmd_type == REQ_TYPE_PM_RESUME)#define blk_rq_cpu_valid (rq) ((rq)->cpu != -1) -#define blk_sorted_rq (rq) ((rq)->cmd_flags & REQ_SORTED) -#define blk_barrier_rq (rq) ((rq)->cmd_flags & REQ_HARDBARRIER) -#define blk_fua_rq (rq) ((rq)->cmd_flags & REQ_FUA) -#define blk_discard_rq (rq) ((rq)->cmd_flags & REQ_DISCARD)#define blk_bidi_rq (rq) ((rq)->next_rq != NULL)/* rq->queuelist of dequeued request must be list_empty() */ #define blk_queued_rq (rq) (!list_empty(&(rq)->queuelist))
@@ -649,9 +636,6 @@ static inline bool rq_is_sync(struct reqreturn rw_is_sync (rq->cmd_flags); } -#define rq_is_meta (rq) ((rq)->cmd_flags & REQ_RW_META) -#define rq_noidle (rq) ((rq)->cmd_flags & REQ_NOIDLE) -static inline int blk_queue_full (struct request_queue *q,int sync) {if (sync)
@@ -684,7 +668,8 @@ static inline void blk_clear_queue_full( (REQ_NOMERGE | REQ_STARTED | REQ_HARDBARRIER | REQ_SOFTBARRIER)#define rq_mergeable (rq) \ (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \ - (blk_discard_rq(rq) || blk_fs_request((rq)))) + (((rq)->cmd_flags & REQ_DISCARD) || \ + (rq)->cmd_type == REQ_TYPE_FS))/* * q->prep_rq_fn return values
kernel/trace/blktrace.c +5 -5
@@ -661,10 +661,10 @@ static void blk_add_trace_rq(struct requif (likely (!bt))return ; -if (blk_discard_rq (rq)) +if (rq->cmd_flags &REQ_DISCARD ) rw |= (1 <<BIO_RW_DISCARD ); -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) { what |=BLK_TC_ACT (BLK_TC_PC );__blk_add_trace (bt,0 ,blk_rq_bytes (rq), rw, what, rq->errors, rq->cmd_len, rq->cmd);
@@ -925,7 +925,7 @@ void blk_add_driver_data(struct request_if (likely (!bt))return ; -if (blk_pc_request (rq)) +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC )__blk_add_trace (bt,0 ,blk_rq_bytes (rq),0 ,BLK_TA_DRV_DATA , rq->errors, len, data);else
@@ -1730,7 +1730,7 @@ void blk_dump_cmd(char *buf, struct requint len = rq->cmd_len;unsigned char *cmd = rq->cmd; -if (!blk_pc_request (rq)) { +if (rq->cmd_type !=REQ_TYPE_BLOCK_PC ) { buf[0 ] ='\0' ;return ; }
@@ -1779,7 +1779,7 @@ void blk_fill_rwbs_rq(char *rwbs, structint rw = rq->cmd_flags &0x03 ;int bytes; -if (blk_discard_rq (rq)) +if (rq->cmd_flags &REQ_DISCARD ) rw |= (1 <<BIO_RW_DISCARD ); bytes =blk_rq_bytes (rq);
block/blk-exec.c +1 -1
@@ -57,7 +57,7 @@ void blk_execute_rq_nowait(struct reques__elv_add_request (q, rq, where,1 );__generic_unplug_device (q);/* the queue is stopped so it won't be plugged+unplugged */ -if (blk_pm_resume_request (rq)) +if (rq->cmd_type ==REQ_TYPE_PM_RESUME ) q->request_fn (q);spin_unlock_irq (q->queue_lock); }
drivers/block/paride/pd.c +1 -1
@@ -439,7 +439,7 @@ static char *pd_buf; /* buffer for requstatic enum action do_pd_io_start (void ) { -if (blk_special_request (pd_req)) { +if (pd_req->cmd_type ==REQ_TYPE_SPECIAL ) { phase = pd_special;return pd_special (); }
drivers/ide/ide-atapi.c +10 -7
@@ -190,7 +190,7 @@ void ide_prep_sense(ide_drive_t *drive,BUG_ON (sense_len >sizeof (*sense)); -if (blk_sense_request (rq) || drive->sense_rq_armed) +if (rq->cmd_type ==REQ_TYPE_SENSE || drive->sense_rq_armed)return ;memset (sense,0 ,sizeof (*sense));
@@ -307,13 +307,16 @@ EXPORT_SYMBOL_GPL(ide_cd_expiry);int ide_cd_get_xferlen (struct request *rq) { -if (blk_fs_request (rq)) +switch (rq->cmd_type) { +case REQ_TYPE_FS :return 32768 ; -else if (blk_sense_request (rq) ||blk_pc_request (rq) || - rq->cmd_type ==REQ_TYPE_ATA_PC ) +case REQ_TYPE_SENSE : +case REQ_TYPE_BLOCK_PC : +case REQ_TYPE_ATA_PC :return blk_rq_bytes (rq); -else +default :return 0 ; + } }EXPORT_SYMBOL_GPL (ide_cd_get_xferlen);
@@ -474,12 +477,12 @@ static ide_startstop_t ide_pc_intr(ide_dif (uptodate ==0 ) drive->failed_pc =NULL ; -if (blk_special_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_SPECIAL ) { rq->errors =0 ; error =0 ; }else { -if (blk_fs_request (rq) ==0 && uptodate <=0 ) { +if (rq->cmd_type !=REQ_TYPE_FS && uptodate <=0 ) {if (rq->errors ==0 ) rq->errors = -EIO ; }
drivers/ide/ide-eh.c +3 -2
@@ -122,7 +122,7 @@ ide_startstop_t ide_error(ide_drive_t *dreturn ide_stopped;/* retry only "normal" I/O: */ -if (!blk_fs_request (rq)) { +if (rq->cmd_type !=REQ_TYPE_FS ) {if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) {struct ide_cmd *cmd = rq->special;
@@ -146,7 +146,8 @@ static inline void ide_complete_drive_re {struct request *rq = drive->hwif->rq; -if (rq &&blk_special_request (rq) && rq->cmd[0 ] ==REQ_DRIVE_RESET ) { +if (rq && rq->cmd_type ==REQ_TYPE_SPECIAL && + rq->cmd[0 ] ==REQ_DRIVE_RESET ) {if (err <=0 && rq->errors ==0 ) rq->errors = -EIO ;ide_complete_rq (drive, err ? err :0 ,blk_rq_bytes (rq));
drivers/ide/ide-floppy.c +16 -9
@@ -73,7 +73,7 @@ static int ide_floppy_callback(ide_drive drive->failed_pc =NULL ;if (pc->c[0 ] ==GPCMD_READ_10 || pc->c[0 ] ==GPCMD_WRITE_10 || - (rq &&blk_pc_request (rq))) + (rq && rq->cmd_type ==REQ_TYPE_BLOCK_PC )) uptodate =1 ;/* FIXME */ else if (pc->c[0 ] ==GPCMD_REQUEST_SENSE ) {
@@ -98,7 +98,7 @@ static int ide_floppy_callback(ide_drive "Aborting request!\n"); } -if (blk_special_request (rq)) +if (rq->cmd_type ==REQ_TYPE_SPECIAL ) rq->errors = uptodate ?0 :IDE_DRV_ERROR_GENERAL ;return uptodate;
@@ -247,14 +247,16 @@ static ide_startstop_t ide_floppy_do_req }else printk(KERN_ERR PFX "%s: I/O error\n", drive->name); -if (blk_special_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_SPECIAL ) { rq->errors =0 ;ide_complete_rq (drive,0 ,blk_rq_bytes (rq));return ide_stopped; }else goto out_end; } -if (blk_fs_request (rq)) { + +switch (rq->cmd_type) { +case REQ_TYPE_FS :if (((long )blk_rq_pos (rq) % floppy->bs_factor) || (blk_rq_sectors (rq) % floppy->bs_factor)) { printk(KERN_ERR PFX "%s: unsupported r/w rq size\n",
@@ -263,13 +265,18 @@ static ide_startstop_t ide_floppy_do_req } pc = &floppy->queued_pc;idefloppy_create_rw_cmd (drive, pc, rq, (unsigned long )block); - }else if (blk_special_request (rq) ||blk_sense_request (rq)) { +break ; +case REQ_TYPE_SPECIAL : +case REQ_TYPE_SENSE : pc = (struct ide_atapi_pc *)rq->special; - }else if (blk_pc_request (rq)) { +break ; +case REQ_TYPE_BLOCK_PC : pc = &floppy->queued_pc;idefloppy_blockpc_cmd (floppy, pc, rq); - }else +break ; +default :BUG (); + }ide_prep_sense (drive, rq);
@@ -280,7 +287,7 @@ static ide_startstop_t ide_floppy_do_req cmd.rq = rq; -if (blk_fs_request (rq) ||blk_rq_bytes (rq)) { +if (rq->cmd_type ==REQ_TYPE_FS ||blk_rq_bytes (rq)) {ide_init_sg_cmd (&cmd,blk_rq_bytes (rq));ide_map_sg (drive, &cmd); }
@@ -290,7 +297,7 @@ static ide_startstop_t ide_floppy_do_reqreturn ide_floppy_issue_pc (drive, &cmd, pc); out_end: drive->failed_pc =NULL ; -if (blk_fs_request (rq) ==0 && rq->errors ==0 ) +if (rq->cmd_type !=REQ_TYPE_FS && rq->errors ==0 ) rq->errors = -EIO ;ide_complete_rq (drive, -EIO ,blk_rq_bytes (rq));return ide_stopped;
drivers/ide/ide-pm.c +4 -4
@@ -191,10 +191,10 @@ void ide_complete_pm_rq(ide_drive_t *dri#ifdef DEBUG_PM printk ("%s: completing PM request, %s\n" , drive->name, -blk_pm_suspend_request (rq) ?"suspend" :"resume" ); + (rq->cmd_type ==REQ_TYPE_PM_SUSPEND ) ?"suspend" :"resume" );#endif spin_lock_irqsave (q->queue_lock, flags); -if (blk_pm_suspend_request (rq)) +if (rq->cmd_type ==REQ_TYPE_PM_SUSPEND )blk_stop_queue (q);else drive->dev_flags &= ~IDE_DFLAG_BLOCKED ;
@@ -210,11 +210,11 @@ void ide_check_pm_state(ide_drive_t *dri {struct request_pm_state *pm = rq->special; -if (blk_pm_suspend_request (rq) && +if (rq->cmd_type ==REQ_TYPE_PM_SUSPEND && pm->pm_step ==IDE_PM_START_SUSPEND )/* Mark drive blocked when starting the suspend sequence. */ drive->dev_flags |=IDE_DFLAG_BLOCKED ; -else if (blk_pm_resume_request (rq) && +else if (rq->cmd_type ==REQ_TYPE_PM_RESUME && pm->pm_step ==IDE_PM_START_RESUME ) {/* * The first thing we do on wakeup is to wait for BSY bit to
drivers/ide/ide-tape.c +2 -1
@@ -577,7 +577,8 @@ static ide_startstop_t idetape_do_reques rq->cmd[0 ], (unsigned long long )blk_rq_pos (rq), blk_rq_sectors(rq)); -BUG_ON (!(blk_special_request (rq) ||blk_sense_request (rq))); +BUG_ON (!(rq->cmd_type ==REQ_TYPE_SPECIAL || + rq->cmd_type ==REQ_TYPE_SENSE ));/* Retry a failed packet command */ if (drive->failed_pc && drive->pc->c[0 ] ==REQUEST_SENSE ) {
block/blk-merge.c +2 -2
@@ -226,7 +226,7 @@ int ll_back_merge_fn(struct request_queu {unsigned short max_sectors; -if (unlikely (blk_pc_request (req))) +if (unlikely (req->cmd_type ==REQ_TYPE_BLOCK_PC )) max_sectors =queue_max_hw_sectors (q);else max_sectors =queue_max_sectors (q);
@@ -250,7 +250,7 @@ int ll_front_merge_fn(struct request_que {unsigned short max_sectors; -if (unlikely (blk_pc_request (req))) +if (unlikely (req->cmd_type ==REQ_TYPE_BLOCK_PC )) max_sectors =queue_max_hw_sectors (q);else max_sectors =queue_max_sectors (q);
drivers/ata/libata-scsi.c +1 -1
@@ -1111,7 +1111,7 @@ static void ata_scsi_sdev_config(struct*/ static int atapi_drain_needed (struct request *rq) { -if (likely (!blk_pc_request (rq))) +if (likely (rq->cmd_type !=REQ_TYPE_BLOCK_PC ))return 0 ;if (!blk_rq_bytes (rq) || (rq->cmd_flags &REQ_RW ))
drivers/block/cciss.c +30 -19
156 lines not on this page · raw message
drivers/block/hd.c +1 -1
@@ -627,7 +627,7 @@ repeat:req_data_dir (req) ==READ ?"read" :"writ" , cyl, head, sec, nsect, req->buffer);#endif -if (blk_fs_request (req)) { +if (req->cmd_type ==REQ_TYPE_FS ) {switch (rq_data_dir (req)) {case READ : hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_READ,
drivers/block/mg_disk.c +2 -2
@@ -670,7 +670,7 @@ static void mg_request_poll(struct requebreak ; } -if (unlikely (!blk_fs_request (host->req))) { +if (unlikely (host->req->cmd_type !=REQ_TYPE_FS )) {mg_end_request_cur (host, -EIO );continue ; }
@@ -756,7 +756,7 @@ static void mg_request(struct request_qucontinue ; } -if (unlikely (!blk_fs_request (req))) { +if (unlikely (req->cmd_type !=REQ_TYPE_FS )) {mg_end_request_cur (host, -EIO );continue ; }
drivers/block/nbd.c +1 -1
@@ -448,7 +448,7 @@ static void nbd_clear_que(struct nbd_devstatic void nbd_handle_req (struct nbd_device *lo,struct request *req) { -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS ) goto error_out;nbd_cmd (req) =NBD_CMD_READ ;
drivers/block/ps3disk.c +1 -1
@@ -196,7 +196,7 @@ static void ps3disk_do_request(struct psdev_dbg (&dev->sbd.core,"%s:%u\n" , __func__, __LINE__);while ((req =blk_fetch_request (q))) { -if (blk_fs_request (req)) { +if (req->cmd_type ==REQ_TYPE_FS ) {if (ps3disk_submit_request_sg (dev, req))break ; } else if (req->cmd_type == REQ_TYPE_LINUX_BLOCK &&
drivers/block/ub.c +4 -4
@@ -648,7 +648,7 @@ static int ub_request_fn_1(struct ub_lunreturn 0 ; } -if (lun->changed && !blk_pc_request (rq)) { +if (lun->changed && rq->cmd_type !=REQ_TYPE_BLOCK_PC ) {blk_start_request (rq);ub_end_rq (rq,SAM_STAT_CHECK_CONDITION );return 0 ;
@@ -684,7 +684,7 @@ static int ub_request_fn_1(struct ub_lun } urq->nsg = n_elem; -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {ub_cmd_build_packet (sc, lun, cmd, urq); }else {ub_cmd_build_block (sc, lun, cmd, urq);
@@ -781,7 +781,7 @@ static void ub_rw_cmd_done(struct ub_dev rq = urq->rq;if (cmd->error ==0 ) { -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {if (cmd->act_len >= rq->resid_len) rq->resid_len =0 ;else
@@ -795,7 +795,7 @@ static void ub_rw_cmd_done(struct ub_dev } } }else { -if (blk_pc_request (rq)) { +if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {/* UB_SENSE_SIZE is smaller than SCSI_SENSE_BUFFERSIZE */ memcpy (rq->sense, sc->top_sense,UB_SENSE_SIZE ); rq->sense_len =UB_SENSE_SIZE ;
drivers/block/viodasd.c +1 -1
@@ -361,7 +361,7 @@ static void do_viodasd_request(struct reif (req ==NULL )return ;/* check that request contains a valid command */ -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {viodasd_end_request (req, -EIO ,blk_rq_sectors (req));continue ; }
drivers/block/xd.c +1 -1
@@ -322,7 +322,7 @@ static void do_xd_request (struct requesint res = -EIO ;int retry; -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS ) { goto done;if (block + count >get_capacity (req->rq_disk)) goto done;
drivers/block/xsysace.c +1 -1
@@ -465,7 +465,7 @@ struct request *ace_get_next_request(strstruct request *req;while ((req =blk_peek_request (q)) !=NULL ) { -if (blk_fs_request (req)) +if (req->cmd_type ==REQ_TYPE_FS )break ;blk_start_request (req);__blk_end_request_all (req, -EIO );
drivers/cdrom/gdrom.c +1 -1
@@ -643,7 +643,7 @@ static void gdrom_request(struct requeststruct request *req;while ((req =blk_fetch_request (rq)) !=NULL ) { -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {printk (KERN_DEBUG "GDROM: Non-fs request ignored\n" );__blk_end_request_all (req, -EIO );continue ;
drivers/cdrom/viocd.c +1 -1
@@ -298,7 +298,7 @@ static void do_viocd_request(struct requstruct request *req;while ((rwreq ==0 ) && ((req =blk_fetch_request (q)) !=NULL )) { -if (!blk_fs_request (req)) +if (req->cmd_type !=REQ_TYPE_FS )__blk_end_request_all (req, -EIO );else if (send_request (req) <0 ) { printk(VIOCD_KERN_WARNING
drivers/ide/ide-disk.c +1 -1
@@ -184,7 +184,7 @@ static ide_startstop_t ide_do_rw_disk(idide_hwif_t *hwif = drive->hwif;BUG_ON (drive->dev_flags &IDE_DFLAG_BLOCKED ); -BUG_ON (!blk_fs_request (rq)); +BUG_ON (rq->cmd_type !=REQ_TYPE_FS );ledtrig_ide_activity ();
drivers/memstick/core/mspro_block.c +2 -1
@@ -805,7 +805,8 @@ static void mspro_block_start(struct memstatic int mspro_block_prepare_req (struct request_queue *q,struct request *req) { -if (!blk_fs_request (req) && !blk_pc_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS && + req->cmd_type !=REQ_TYPE_BLOCK_PC ) {blk_dump_rq_flags (req,"MSPro unsupported request" );return BLKPREP_KILL ; }
drivers/message/i2o/i2o_block.c +1 -1
@@ -883,7 +883,7 @@ static void i2o_block_request_fn(structif (!req)break ; -if (blk_fs_request (req)) { +if (req->cmd_type ==REQ_TYPE_FS ) {struct i2o_block_delayed_request *dreq;struct i2o_block_request *ireq = req->special;unsigned int queue_depth;
drivers/mmc/card/queue.c +1 -1
@@ -32,7 +32,7 @@ static int mmc_prep_request(struct reque/* * We only like normal block requests. */ -if (!blk_fs_request (req)) { +if (req->cmd_type !=REQ_TYPE_FS ) {blk_dump_rq_flags (req,"MMC bad request" );return BLKPREP_KILL ; }
drivers/scsi/scsi_lib.c +3 -2
@@ -722,7 +722,7 @@ void scsi_io_completion(struct scsi_cmnd sense_deferred =scsi_sense_is_deferred (&sshdr); } -if (blk_pc_request (req)) {/* SG_IO ioctl from block level */ +if (req->cmd_type ==REQ_TYPE_BLOCK_PC ) {/* SG_IO ioctl from block level */ req->errors = result;if (result) {if (sense_valid && req->sense) {
@@ -757,7 +757,8 @@ void scsi_io_completion(struct scsi_cmnd } } -BUG_ON (blk_bidi_rq (req));/* bidi not support for !blk_pc_request yet */ +/* no bidi support for !REQ_TYPE_BLOCK_PC yet */ +BUG_ON (blk_bidi_rq (req));/* * Next deal with any sectors which we were able to correctly
drivers/scsi/sun3_NCR5380.c +1 -1
@@ -2022,7 +2022,7 @@ static void NCR5380_information_transferif ((count >SUN3_DMA_MINSIZE ) && (sun3_dma_setup_done != cmd)) { -if (blk_fs_request (cmd->request)) { +if (cmd->request->cmd_type ==REQ_TYPE_FS ) {sun3scsi_dma_setup (d, count,rq_data_dir (cmd->request)); sun3_dma_setup_done = cmd;
drivers/scsi/sun3_scsi.c +1 -1
@@ -524,7 +524,7 @@ static inline unsigned long sun3scsi_dma struct scsi_cmnd *cmd, int write_flag) { -if (blk_fs_request (cmd->request)) +if (cmd->request->cmd_type ==REQ_TYPE_FS )return wanted;else return 0 ;
drivers/scsi/sun3_scsi_vme.c +1 -1
@@ -458,7 +458,7 @@ static inline unsigned long sun3scsi_dma struct scsi_cmnd *cmd, int write_flag) { -if (blk_fs_request (cmd->request)) +if (cmd->request->cmd_type ==REQ_TYPE_FS )return wanted;else return 0 ;
include/linux/blktrace_api.h +1 -1
@@ -224,7 +224,7 @@ static inline int blk_trace_init_sysfs(sstatic inline int blk_cmd_buf_len (struct request *rq) { -return blk_pc_request (rq) ? rq->cmd_len *3 :1 ; +return (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? rq->cmd_len *3 :1 ; }extern void blk_dump_cmd (char *buf,struct request *rq);
include/trace/events/block.h +10 -5
@@ -25,8 +25,10 @@ DECLARE_EVENT_CLASS(block_rq_with_error,TP_fast_assign ( __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; - __entry->sector =blk_pc_request (rq) ?0 :blk_rq_pos (rq); - __entry->nr_sector =blk_pc_request (rq) ?0 :blk_rq_sectors (rq); + __entry->sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_pos (rq); + __entry->nr_sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_sectors (rq); __entry->errors = rq->errors;blk_fill_rwbs_rq (__entry->rwbs, rq);
@@ -109,9 +111,12 @@ DECLARE_EVENT_CLASS(block_rq,TP_fast_assign ( __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; - __entry->sector =blk_pc_request (rq) ?0 :blk_rq_pos (rq); - __entry->nr_sector =blk_pc_request (rq) ?0 :blk_rq_sectors (rq); - __entry->bytes =blk_pc_request (rq) ?blk_rq_bytes (rq) :0 ; + __entry->sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_pos (rq); + __entry->nr_sector = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +0 :blk_rq_sectors (rq); + __entry->bytes = (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) ? +blk_rq_bytes (rq) :0 ;blk_fill_rwbs_rq (__entry->rwbs, rq);blk_dump_cmd (__get_str (cmd), rq);
Jens Axboe
maintainerQuoted 6 lines · Christoph Hellwig
Quoted 5 lines · Jens Axboe
Quoted 3 lines · Christoph Hellwig
Remove all the trivial wrappers for the
cmd_typeandcmd_flagsfields in struct requests. This allows much easier grepping for different request types instead of unwinding through macros.
Quoted 8 lines
Quoted 5 lines
Agree. I kind of liked it in the beginning, but it really just adds an extra layer of grep or cscope stack when you forget what it checks specifically.
Was this a scripted conversion?
No. And as you already noticed I sent you the version before fixing up the make allmodconfig fallout. Here's the fixed one:
Ditto on this one, are there fixes in this one apart from the problems I posted?
Signature · 1 line
Jens Axboe
Quoted 2 lines · Jens Axboe
Ditto on this one, are there fixes in this one apart from the problems I posted?
I'll do an allmodconfig build on your tree to find out.
Jens Axboe
maintainerdrivers/block/cciss.c static inline void complete_command(ctlr · line 3051
Quoted 13 lines · Christoph Hellwig
Index:
linux-2.6/drivers/block/cciss.c
===================================================================drivers/block/cciss.c +1
-1@@ -3043,7 +3045,7 @@ static inline void complete_command(ctlr }break ;case CMD_DATA_OVERRUN : -if (blk_fs_request (cmd->rq)) +if (cmd->rq->cmd_type ==REQ_TYPE_FS ) {printk (KERN_WARNING "cciss: cmd %p has" " completed with data overrun " "reported\n" , cmd);
Woops...
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerQuoted 11 lines
Index:
linux-2.6/drivers/block/virtio_blk.c
===================================================================drivers/block/virtio_blk.c +2
-1@@ -65,13 +65,16 @@ static void blk_done(struct virtqueue *vbreak ; } -if (blk_pc_request (vbr->req)) { +switch (vbr->req->cmd_type) { +case REQ_TYPE_BLOCK_PC :
drivers/block/virtio_blk.c static void blk_done(struct virtqueue *v · line 77
Quoted 10 lines
drivers/block/virtio_blk.c +4
-2vbr->req->resid_len = vbr->in_hdr.residual; vbr->req->sense_len = vbr->in_hdr.sense_len; vbr->req->errors = vbr->in_hdr.errors; - } -if (blk_special_request (vbr->req)) +break ; +case REQ_TYPE_SPECIAL : vbr->req->errors = (error !=0 ); +break ; + }
This conversion also makes gcc unhappy, since you don't supply a default case. A bit silly since it's the end of the processing, I'll add one just to shut it up.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerdrivers/md/dm.c static void dm_end_request(struct reques · line 798
Quoted 13 lines · Christoph Hellwig
Index:
linux-2.6/drivers/md/dm.c
===================================================================drivers/md/dm.c +1
-1@@ -792,12 +792,12 @@ static void dm_end_request(struct reques {int rw =rq_data_dir (clone);int run_queue =1 ; -bool is_barrier =blk_barrier_rq (clone); + bool is_barrier = (clone->cmd_flags & REQ_HARDBARRIER)struct dm_rq_target_io *tio = clone->end_io_data;struct mapped_device *md = tio->md;struct request *rq = tio->orig;
Ahem... I think we can safely conclude that you did NOT script the conversion. I'm not too worried about the typos that cause compilation failures, I'm worried about the ones that do not.
Signature · 1 line
Jens Axboe