sg: rename sg_cmd_done sg_rq_end_io
old sg_rq_end_io() was used to wrap sg_cmd_done during converting sg to use the block layer (in order to cover the difference scsi_execute_async and blk_execute_rq_nowait). Now we don't need it so let's remove it. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
224cb3e981
commit
a91a3a20e0
1 changed files with 12 additions and 11 deletions
|
@ -177,7 +177,7 @@ typedef struct sg_device { /* holds the state of each scsi generic device */
|
|||
|
||||
static int sg_fasync(int fd, struct file *filp, int mode);
|
||||
/* tasklet or soft irq callback */
|
||||
static void sg_cmd_done(void *data, char *sense, int result, int resid);
|
||||
static void sg_rq_end_io(struct request *rq, int uptodate);
|
||||
static int sg_start_req(Sg_request *srp, unsigned char *cmd);
|
||||
static void sg_finish_rem_req(Sg_request * srp);
|
||||
static int sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size);
|
||||
|
@ -227,11 +227,6 @@ static int sg_allow_access(struct file *filp, unsigned char *cmd)
|
|||
cmd, filp->f_mode & FMODE_WRITE);
|
||||
}
|
||||
|
||||
static void sg_rq_end_io(struct request *rq, int uptodate)
|
||||
{
|
||||
sg_cmd_done(rq->end_io_data, rq->sense, rq->errors, rq->data_len);
|
||||
}
|
||||
|
||||
static int
|
||||
sg_open(struct inode *inode, struct file *filp)
|
||||
{
|
||||
|
@ -1257,16 +1252,19 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* This function is a "bottom half" handler that is called by the
|
||||
* mid level when a command is completed (or has failed). */
|
||||
static void
|
||||
sg_cmd_done(void *data, char *sense, int result, int resid)
|
||||
/*
|
||||
* This function is a "bottom half" handler that is called by the mid
|
||||
* level when a command is completed (or has failed).
|
||||
*/
|
||||
static void sg_rq_end_io(struct request *rq, int uptodate)
|
||||
{
|
||||
Sg_request *srp = data;
|
||||
struct sg_request *srp = rq->end_io_data;
|
||||
Sg_device *sdp = NULL;
|
||||
Sg_fd *sfp;
|
||||
unsigned long iflags;
|
||||
unsigned int ms;
|
||||
char *sense;
|
||||
int result, resid;
|
||||
|
||||
if (NULL == srp) {
|
||||
printk(KERN_ERR "sg_cmd_done: NULL request\n");
|
||||
|
@ -1280,6 +1278,9 @@ sg_cmd_done(void *data, char *sense, int result, int resid)
|
|||
return;
|
||||
}
|
||||
|
||||
sense = rq->sense;
|
||||
result = rq->errors;
|
||||
resid = rq->data_len;
|
||||
|
||||
SCSI_LOG_TIMEOUT(4, printk("sg_cmd_done: %s, pack_id=%d, res=0x%x\n",
|
||||
sdp->disk->disk_name, srp->header.pack_id, result));
|
||||
|
|
Reference in a new issue