* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
GOTO(unlock, rc = -ENOENT);
/* parse remote buffers to local buffers and prepare the latter */
+ *nr_local = 0;
for (i = 0, j = 0; i < niocount; i++) {
rc = dt_bufs_get(env, ofd_object_child(fo), rnb + i,
lnb + j, 0, ofd_object_capa(env, fo));
- LASSERT(rc > 0);
+ if (unlikely(rc < 0))
+ GOTO(buf_put, rc);
LASSERT(rc <= PTLRPC_MAX_BRW_PAGES);
/* correct index for local buffers to continue with */
j += rc;
+ *nr_local += rc;
LASSERT(j <= PTLRPC_MAX_BRW_PAGES);
tot_bytes += rnb[i].rnb_len;
}
- *nr_local = j;
LASSERT(*nr_local > 0 && *nr_local <= PTLRPC_MAX_BRW_PAGES);
rc = dt_attr_get(env, ofd_object_child(fo), la,
ofd_object_capa(env, fo));
ofd_read_lock(env, fo);
if (!ofd_object_exists(fo)) {
- CERROR("%s: BRW to missing obj "LPU64"/"LPU64"\n",
- exp->exp_obd->obd_name, obj->ioo_id, obj->ioo_seq);
+ CERROR("%s: BRW to missing obj "DOSTID"\n",
+ exp->exp_obd->obd_name, POSTID(&obj->ioo_oid));
ofd_read_unlock(env, fo);
ofd_object_put(env, fo);
GOTO(out, rc = -ENOENT);
ofd_grant_prepare_write(env, exp, oa, rnb, obj->ioo_bufcnt);
/* parse remote buffers to local buffers and prepare the latter */
+ *nr_local = 0;
for (i = 0, j = 0; i < obj->ioo_bufcnt; i++) {
rc = dt_bufs_get(env, ofd_object_child(fo),
rnb + i, lnb + j, 1,
ofd_object_capa(env, fo));
- LASSERT(rc > 0);
+ if (unlikely(rc < 0))
+ GOTO(err, rc);
LASSERT(rc <= PTLRPC_MAX_BRW_PAGES);
/* correct index for local buffers to continue with */
for (k = 0; k < rc; k++) {
lnb[j+k].lnb_flags &= ~OBD_BRW_NOQUOTA;
}
j += rc;
+ *nr_local += rc;
LASSERT(j <= PTLRPC_MAX_BRW_PAGES);
tot_bytes += rnb[i].rnb_len;
}
- *nr_local = j;
LASSERT(*nr_local > 0 && *nr_local <= PTLRPC_MAX_BRW_PAGES);
rc = dt_write_prep(env, ofd_object_child(fo), lnb, *nr_local);
- if (unlikely(rc != 0)) {
- dt_bufs_put(env, ofd_object_child(fo), lnb, *nr_local);
- ofd_read_unlock(env, fo);
- /* ofd_grant_prepare_write() was called, so we must commit */
- ofd_grant_commit(env, exp, rc);
- GOTO(out, rc);
- }
+ if (unlikely(rc != 0))
+ GOTO(err, rc);
lprocfs_counter_add(ofd_obd(ofd)->obd_stats,
LPROC_OFD_WRITE_BYTES, tot_bytes);
ofd_counter_incr(exp, LPROC_OFD_STATS_WRITE,
oti->oti_jobid, tot_bytes);
RETURN(0);
+err:
+ dt_bufs_put(env, ofd_object_child(fo), lnb, *nr_local);
+ ofd_read_unlock(env, fo);
+ /* ofd_grant_prepare_write() was called, so we must commit */
+ ofd_grant_commit(env, exp, rc);
out:
/* let's still process incoming grant information packed in the oa,
* but without enforcing grant since we won't proceed with the write.
struct ofd_thread_info *info;
int rc = 0;
+ if (*nr_local > PTLRPC_MAX_BRW_PAGES) {
+ CERROR("%s: bulk has too many pages %d, which exceeds the"
+ "maximum pages per RPC of %d\n",
+ exp->exp_obd->obd_name, *nr_local, PTLRPC_MAX_BRW_PAGES);
+ RETURN(-EPROTO);
+ }
+
rc = lu_env_refill((struct lu_env *)env);
LASSERT(rc == 0);
info = ofd_info_init(env, exp);
if (OBD_FAIL_CHECK(OBD_FAIL_OST_ENOENT)) {
struct ofd_seq *oseq;
- oseq = ofd_seq_load(env, ofd, oa->o_seq);
+ oseq = ofd_seq_load(env, ofd, ostid_seq(&oa->o_oi));
if (IS_ERR(oseq)) {
- CERROR("%s: Can not find seq for "LPU64":"LPU64
- ": rc = %ld\n", ofd_name(ofd), oa->o_seq,
- oa->o_id, PTR_ERR(oseq));
+ CERROR("%s: Can not find seq for "DOSTID
+ ": rc = %ld\n", ofd_name(ofd), POSTID(&oa->o_oi),
+ PTR_ERR(oseq));
RETURN(-EINVAL);
}
LASSERT(objcount == 1);
LASSERT(obj->ioo_bufcnt > 0);
- fid_ostid_unpack(&info->fti_fid, &oa->o_oi, 0);
+ rc = ostid_to_fid(&info->fti_fid, &oa->o_oi, 0);
+ if (unlikely(rc != 0))
+ RETURN(rc);
+
if (cmd == OBD_BRW_WRITE) {
- rc = ofd_auth_capa(exp, &info->fti_fid, oa->o_seq,
+ rc = ofd_auth_capa(exp, &info->fti_fid, ostid_seq(&oa->o_oi),
capa, CAPA_OPC_OSS_WRITE);
if (rc == 0) {
la_from_obdo(&info->fti_attr, oa, OBD_MD_FLGETATTR);
obj, rnb, nr_local, lnb, oti);
}
} else if (cmd == OBD_BRW_READ) {
- rc = ofd_auth_capa(exp, &info->fti_fid, oa->o_seq,
+ rc = ofd_auth_capa(exp, &info->fti_fid, ostid_seq(&oa->o_oi),
capa, CAPA_OPC_OSS_READ);
if (rc == 0) {
ofd_grant_prepare_read(env, exp, oa);
}
/* get attr to return */
- dt_attr_get(env, o, la, ofd_object_capa(env, fo));
+ rc = dt_attr_get(env, o, la, ofd_object_capa(env, fo));
out_stop:
/* Force commit to make the just-deleted blocks
LASSERT(npages > 0);
- fid_ostid_unpack(&info->fti_fid, &oa->o_oi, 0);
+ rc = ostid_to_fid(&info->fti_fid, &oa->o_oi, 0);
+ if (unlikely(rc != 0))
+ RETURN(rc);
if (cmd == OBD_BRW_WRITE) {
/* Don't update timestamps if this write is older than a
* setattr which modifies the timestamps. b=10150 */
if (oa && ns && ns->ns_lvbo && ns->ns_lvbo->lvbo_update) {
struct ldlm_resource *rs = NULL;
- ofd_build_resid(&info->fti_fid, &info->fti_resid);
+ ost_fid_build_resid(&info->fti_fid, &info->fti_resid);
rs = ldlm_resource_get(ns, NULL, &info->fti_resid,
LDLM_EXTENT, 0);
if (rs != NULL) {
git://git.whamcloud.com / fs / lustre-release.git / blobdiff