mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-02 14:46:47 +07:00
Merge branch 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Document bi_sector and sector_t [PATCH] helper function for retrieving scsi_cmd given host based block layer tag
This commit is contained in:
commit
cc94dcf5f2
@ -840,12 +840,7 @@ EXPORT_SYMBOL(blk_queue_dma_alignment);
|
||||
**/
|
||||
struct request *blk_queue_find_tag(request_queue_t *q, int tag)
|
||||
{
|
||||
struct blk_queue_tag *bqt = q->queue_tags;
|
||||
|
||||
if (unlikely(bqt == NULL || tag >= bqt->real_max_depth))
|
||||
return NULL;
|
||||
|
||||
return bqt->tag_index[tag];
|
||||
return blk_map_queue_find_tag(q->queue_tags, tag);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(blk_queue_find_tag);
|
||||
|
@ -70,7 +70,8 @@ typedef void (bio_destructor_t) (struct bio *);
|
||||
* stacking drivers)
|
||||
*/
|
||||
struct bio {
|
||||
sector_t bi_sector;
|
||||
sector_t bi_sector; /* device address in 512 byte
|
||||
sectors */
|
||||
struct bio *bi_next; /* request queue link */
|
||||
struct block_device *bi_bdev;
|
||||
unsigned long bi_flags; /* status, command, etc */
|
||||
|
@ -769,6 +769,14 @@ extern struct blk_queue_tag *blk_init_tags(int);
|
||||
extern void blk_free_tags(struct blk_queue_tag *);
|
||||
extern void blk_congestion_end(int rw);
|
||||
|
||||
static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,
|
||||
int tag)
|
||||
{
|
||||
if (unlikely(bqt == NULL || tag >= bqt->real_max_depth))
|
||||
return NULL;
|
||||
return bqt->tag_index[tag];
|
||||
}
|
||||
|
||||
extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
|
||||
extern int blkdev_issue_flush(struct block_device *, sector_t *);
|
||||
|
||||
|
@ -129,8 +129,12 @@ typedef __s64 int64_t;
|
||||
/* this is a special 64bit data type that is 8-byte aligned */
|
||||
#define aligned_u64 unsigned long long __attribute__((aligned(8)))
|
||||
|
||||
/*
|
||||
/**
|
||||
* The type used for indexing onto a disc or disc partition.
|
||||
*
|
||||
* Linux always considers sectors to be 512 bytes long independently
|
||||
* of the devices real block size.
|
||||
*
|
||||
* If required, asm/types.h can override it and define
|
||||
* HAVE_SECTOR_T
|
||||
*/
|
||||
|
@ -144,5 +144,25 @@ static inline int scsi_init_shared_tag_map(struct Scsi_Host *shost, int depth)
|
||||
return shost->bqt ? 0 : -ENOMEM;
|
||||
}
|
||||
|
||||
/**
|
||||
* scsi_host_find_tag - find the tagged command by host
|
||||
* @shost: pointer to scsi_host
|
||||
* @tag: tag of the scsi_cmnd
|
||||
*
|
||||
* Notes:
|
||||
* Only works with tags allocated by the generic blk layer.
|
||||
**/
|
||||
static inline struct scsi_cmnd *scsi_host_find_tag(struct Scsi_Host *shost,
|
||||
int tag)
|
||||
{
|
||||
struct request *req;
|
||||
|
||||
if (tag != SCSI_NO_TAG) {
|
||||
req = blk_map_queue_find_tag(shost->bqt, tag);
|
||||
return req ? (struct scsi_cmnd *)req->special : NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_BLOCK */
|
||||
#endif /* _SCSI_SCSI_TCQ_H */
|
||||
|
Loading…
Reference in New Issue
Block a user