James Smart wrote: > Current patch is the RFC, at : > http://marc.info/?l=linux-scsi&m=123436574018579&w=2 > > -- james s > > Boaz Harrosh wrote: >> My humble opinion is: That none of the patches should go in. It is easy >> enough to use the API as it is, and it is more correct then any of the >> suggested alternatives. >> >> Please point me to the latest code-base and I'll fix you a patch that I >> think looks very simple and will work well. >> >> Cheers, have a good day >> Boaz >> My changes below > +static void > +fc_bsg_jobdone(struct fc_bsg_job *job) > +{ > + struct request *req = job->req; > + struct request *rsp = req->next_rq; > + unsigned long flags; > + unsigned rsp_len; - unsigned rsp_len; + unsigned rsp_len = 0, req_len = blk_rq_bytes(req); > + int err; > + > + spin_lock_irqsave(&job->job_lock, flags); > + job->state_flags |= FC_RQST_STATE_DONE; > + job->ref_cnt--; > + spin_unlock_irqrestore(&job->job_lock, flags); > + > + err = job->req->errors = job->reply->result; > + if (err < 0) > + /* we're only returning the result field in the reply */ > + job->req->sense_len = sizeof(uint32_t); > + else > + job->req->sense_len = job->reply_len; > + > + if (rsp) { > + rsp_len = blk_rq_bytes(rsp); > + BUG_ON(job->reply->reply_payload_rcv_len > rsp_len); > + /* set reply (bidi) residual */ > + rsp->data_len = (rsp_len - job->reply->reply_payload_rcv_len); > + } > + > + /* we assume all request payload was transferred */ - /* we assume all request payload was transferred */ + /* we assume all request payload was transferred, residual == 0 */ + req->data_len = 0; Note: this is the proper procedure. Otherwise bsg user will receive transfer residual of all payload. On the other hand you might have more precise residual information here, as received from the scsi transport? (Specially in the error case, perhaps in the future). > + blk_end_request(req, err, blk_rq_bytes(req)); - blk_end_request(req, err, blk_rq_bytes(req)); + blk_end_bidi_request(req, err, req_len, rsp_len); > + > + fc_destroy_bsgjob(job); > +} This should take care of all possible cases, (bidi or otherwise), and will return the proper transfer residual count of 0 to user-mode. Thanks Boaz -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
