c3a4d78c58
rq->data_len served two purposes - the length of data buffer on issue and the residual count on completion. This duality creates some headaches. First of all, block layer and low level drivers can't really determine what rq->data_len contains while a request is executing. It could be the total request length or it coulde be anything else one of the lower layers is using to keep track of residual count. This complicates things because blk_rq_bytes() and thus [__]blk_end_request_all() relies on rq->data_len for PC commands. Drivers which want to report residual count should first cache the total request length, update rq->data_len and then complete the request with the cached data length. Secondly, it makes requests default to reporting full residual count, ie. reporting that no data transfer occurred. The residual count is an exception not the norm; however, the driver should clear rq->data_len to zero to signify the normal cases while leaving it alone means no data transfer occurred at all. This reverse default behavior complicates code unnecessarily and renders block PC on some drivers (ide-tape/floppy) unuseable. This patch adds rq->resid_len which is used only for residual count. While at it, remove now unnecessasry blk_rq_bytes() caching in ide_pc_intr() as rq->data_len is not changed anymore. Boaz : spotted missing conversion in osd Sergei : spotted too early conversion to blk_rq_bytes() in ide-tape [ Impact: cleanup residual count handling, report 0 resid by default ] Signed-off-by: Tejun Heo <tj@kernel.org> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Cc: Borislav Petkov <petkovbb@googlemail.com> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: Mike Miller <mike.miller@hp.com> Cc: Eric Moore <Eric.Moore@lsi.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Doug Gilbert <dgilbert@interlog.com> Cc: Mike Miller <mike.miller@hp.com> Cc: Eric Moore <Eric.Moore@lsi.com> Cc: Darrick J. Wong <djwong@us.ibm.com> Cc: Pete Zaitcev <zaitcev@redhat.com> Cc: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
154 lines
4.0 KiB
C
154 lines
4.0 KiB
C
/*
|
|
* Copyright (C) 2005, 2006
|
|
* Avishay Traeger (avishay@gmail.com) (avishay@il.ibm.com)
|
|
* Copyright (C) 2005, 2006
|
|
* International Business Machines
|
|
* Copyright (C) 2008, 2009
|
|
* Boaz Harrosh <bharrosh@panasas.com>
|
|
*
|
|
* This file is part of exofs.
|
|
*
|
|
* exofs is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation. Since it is based on ext2, and the only
|
|
* valid version of GPL for the Linux kernel is version 2, the only valid
|
|
* version of GPL for exofs is version 2.
|
|
*
|
|
* exofs is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with exofs; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <scsi/scsi_device.h>
|
|
#include <scsi/osd_sense.h>
|
|
|
|
#include "exofs.h"
|
|
|
|
int exofs_check_ok_resid(struct osd_request *or, u64 *in_resid, u64 *out_resid)
|
|
{
|
|
struct osd_sense_info osi;
|
|
int ret = osd_req_decode_sense(or, &osi);
|
|
|
|
if (ret) { /* translate to Linux codes */
|
|
if (osi.additional_code == scsi_invalid_field_in_cdb) {
|
|
if (osi.cdb_field_offset == OSD_CFO_STARTING_BYTE)
|
|
ret = -EFAULT;
|
|
if (osi.cdb_field_offset == OSD_CFO_OBJECT_ID)
|
|
ret = -ENOENT;
|
|
else
|
|
ret = -EINVAL;
|
|
} else if (osi.additional_code == osd_quota_error)
|
|
ret = -ENOSPC;
|
|
else
|
|
ret = -EIO;
|
|
}
|
|
|
|
/* FIXME: should be include in osd_sense_info */
|
|
if (in_resid)
|
|
*in_resid = or->in.req ? or->in.req->resid_len : 0;
|
|
|
|
if (out_resid)
|
|
*out_resid = or->out.req ? or->out.req->resid_len : 0;
|
|
|
|
return ret;
|
|
}
|
|
|
|
void exofs_make_credential(u8 cred_a[OSD_CAP_LEN], const struct osd_obj_id *obj)
|
|
{
|
|
osd_sec_init_nosec_doall_caps(cred_a, obj, false, true);
|
|
}
|
|
|
|
/*
|
|
* Perform a synchronous OSD operation.
|
|
*/
|
|
int exofs_sync_op(struct osd_request *or, int timeout, uint8_t *credential)
|
|
{
|
|
int ret;
|
|
|
|
or->timeout = timeout;
|
|
ret = osd_finalize_request(or, 0, credential, NULL);
|
|
if (ret) {
|
|
EXOFS_DBGMSG("Faild to osd_finalize_request() => %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = osd_execute_request(or);
|
|
|
|
if (ret)
|
|
EXOFS_DBGMSG("osd_execute_request() => %d\n", ret);
|
|
/* osd_req_decode_sense(or, ret); */
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Perform an asynchronous OSD operation.
|
|
*/
|
|
int exofs_async_op(struct osd_request *or, osd_req_done_fn *async_done,
|
|
void *caller_context, u8 *cred)
|
|
{
|
|
int ret;
|
|
|
|
ret = osd_finalize_request(or, 0, cred, NULL);
|
|
if (ret) {
|
|
EXOFS_DBGMSG("Faild to osd_finalize_request() => %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = osd_execute_request_async(or, async_done, caller_context);
|
|
|
|
if (ret)
|
|
EXOFS_DBGMSG("osd_execute_request_async() => %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
int extract_attr_from_req(struct osd_request *or, struct osd_attr *attr)
|
|
{
|
|
struct osd_attr cur_attr = {.attr_page = 0}; /* start with zeros */
|
|
void *iter = NULL;
|
|
int nelem;
|
|
|
|
do {
|
|
nelem = 1;
|
|
osd_req_decode_get_attr_list(or, &cur_attr, &nelem, &iter);
|
|
if ((cur_attr.attr_page == attr->attr_page) &&
|
|
(cur_attr.attr_id == attr->attr_id)) {
|
|
attr->len = cur_attr.len;
|
|
attr->val_ptr = cur_attr.val_ptr;
|
|
return 0;
|
|
}
|
|
} while (iter);
|
|
|
|
return -EIO;
|
|
}
|
|
|
|
int osd_req_read_kern(struct osd_request *or,
|
|
const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
|
|
{
|
|
struct request_queue *req_q = or->osd_dev->scsi_device->request_queue;
|
|
struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
|
|
|
|
if (!bio)
|
|
return -ENOMEM;
|
|
|
|
osd_req_read(or, obj, bio, offset);
|
|
return 0;
|
|
}
|
|
|
|
int osd_req_write_kern(struct osd_request *or,
|
|
const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
|
|
{
|
|
struct request_queue *req_q = or->osd_dev->scsi_device->request_queue;
|
|
struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
|
|
|
|
if (!bio)
|
|
return -ENOMEM;
|
|
|
|
osd_req_write(or, obj, bio, offset);
|
|
return 0;
|
|
}
|