/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011 Whamcloud, Inc.
+ *
*/
/*
* This file is part of Lustre, http://www.lustre.org/
/**
* Do not return server-side uid/gid to remote client
*/
-static void ost_drop_id(struct obd_export *exp, struct obdo *oa)
+static void ost_drop_id(struct obd_export *exp, struct obdo *oa)
{
if (exp_connect_rmtclient(exp)) {
oa->o_uid = -1;
/**
* Validate oa from client.
- * 1. If the request comes from 1.8 clients, it will reset o_seq with MDT0.
- * 2. If the request comes from 2.0 clients, currently only RSVD seq and IDIF
- * req are valid.
- * a. for single MDS seq = FID_SEQ_OST_MDT0,
- * b. for CMD, seq = FID_SEQ_OST_MDT0, FID_SEQ_OST_MDT1 - FID_SEQ_OST_MAX
+ * If the request comes from 2.0 clients, currently only RSVD seq and IDIF
+ * req are valid.
+ * a. for single MDS seq = FID_SEQ_OST_MDT0,
+ * b. for CMD, seq = FID_SEQ_OST_MDT0, FID_SEQ_OST_MDT1 - FID_SEQ_OST_MAX
*/
static int ost_validate_obdo(struct obd_export *exp, struct obdo *oa,
struct obd_ioobj *ioobj)
{
- if (oa != NULL && (!(oa->o_valid & OBD_MD_FLGROUP) ||
- !(exp->exp_connect_flags & OBD_CONNECT_FULL20))) {
+ if (oa != NULL && !(oa->o_valid & OBD_MD_FLGROUP)) {
oa->o_seq = FID_SEQ_OST_MDT0;
if (ioobj)
ioobj->ioo_seq = FID_SEQ_OST_MDT0;
static int ost_getattr(struct obd_export *exp, struct ptlrpc_request *req)
{
struct ost_body *body, *repbody;
- struct obd_info oinfo = { { { 0 } } };
+ struct obd_info *oinfo;
struct lustre_handle lh = { 0 };
+ struct lustre_capa *capa = NULL;
int rc;
ENTRY;
if (rc)
RETURN(rc);
- repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
- repbody->oa = body->oa;
-
rc = ost_lock_get(exp, &body->oa, 0, OBD_OBJECT_EOF, &lh, LCK_PR, 0);
if (rc)
RETURN(rc);
- oinfo.oi_oa = &repbody->oa;
- if (oinfo.oi_oa->o_valid & OBD_MD_FLOSSCAPA) {
- oinfo.oi_capa = req_capsule_client_get(&req->rq_pill,
- &RMF_CAPA1);
- if (oinfo.oi_capa == NULL) {
+ if (body->oa.o_valid & OBD_MD_FLOSSCAPA) {
+ capa = req_capsule_client_get(&req->rq_pill, &RMF_CAPA1);
+ if (capa == NULL) {
CERROR("Missing capability for OST GETATTR");
- RETURN (-EFAULT);
+ GOTO(unlock, rc = -EFAULT);
}
}
- req->rq_status = obd_getattr(exp, &oinfo);
- ost_lock_put(exp, &lh, LCK_PR);
+ OBD_ALLOC_PTR(oinfo);
+ if (!oinfo)
+ GOTO(unlock, rc = -ENOMEM);
+ oinfo->oi_oa = &body->oa;
+ oinfo->oi_capa = capa;
+ req->rq_status = obd_getattr(exp, oinfo);
+
+ OBD_FREE_PTR(oinfo);
+
+ repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
+ repbody->oa = body->oa;
ost_drop_id(exp, &repbody->oa);
+
+unlock:
+ ost_lock_put(exp, &lh, LCK_PR);
+
RETURN(0);
}
RETURN(rc);
repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
- memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
- oti->oti_logcookies = &repbody->oa.o_lcookie;
+ repbody->oa = body->oa;
+ oti->oti_logcookies = &body->oa.o_lcookie;
req->rq_status = obd_create(exp, &repbody->oa, NULL, oti);
//obd_log_cancel(conn, NULL, 1, oti->oti_logcookies, 0);
static int ost_punch(struct obd_export *exp, struct ptlrpc_request *req,
struct obd_trans_info *oti)
{
- struct obd_info oinfo = { { { 0 } } };
struct ost_body *body, *repbody;
int rc, flags = 0;
struct lustre_handle lh = {0,};
if (rc)
RETURN(rc);
- oinfo.oi_oa = &body->oa;
- oinfo.oi_policy.l_extent.start = oinfo.oi_oa->o_size;
- oinfo.oi_policy.l_extent.end = oinfo.oi_oa->o_blocks;
-
- if ((oinfo.oi_oa->o_valid & (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS)) !=
+ if ((body->oa.o_valid & (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS)) !=
(OBD_MD_FLSIZE | OBD_MD_FLBLOCKS))
RETURN(-EPROTO);
/* standard truncate optimization: if file body is completely
* destroyed, don't send data back to the server. */
- if (oinfo.oi_oa->o_size == 0)
+ if (body->oa.o_size == 0)
flags |= LDLM_AST_DISCARD_DATA;
- repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
- rc = ost_lock_get(exp, oinfo.oi_oa, oinfo.oi_oa->o_size,
- oinfo.oi_oa->o_blocks, &lh, LCK_PW, flags);
+ rc = ost_lock_get(exp, &body->oa, body->oa.o_size, body->oa.o_blocks,
+ &lh, LCK_PW, flags);
if (rc == 0) {
- if (oinfo.oi_oa->o_valid & OBD_MD_FLFLAGS &&
- oinfo.oi_oa->o_flags == OBD_FL_SRVLOCK)
+ struct obd_info *oinfo;
+ struct lustre_capa *capa = NULL;
+
+ if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+ body->oa.o_flags == OBD_FL_SRVLOCK)
/*
* If OBD_FL_SRVLOCK is the only bit set in
* ->o_flags, clear OBD_MD_FLFLAGS to avoid falling
* through filter_setattr() to filter_iocontrol().
*/
- oinfo.oi_oa->o_valid &= ~OBD_MD_FLFLAGS;
+ body->oa.o_valid &= ~OBD_MD_FLFLAGS;
- if (oinfo.oi_oa->o_valid & OBD_MD_FLOSSCAPA) {
- oinfo.oi_capa = req_capsule_client_get(&req->rq_pill,
- &RMF_CAPA1);
- if (oinfo.oi_capa == NULL) {
+ if (body->oa.o_valid & OBD_MD_FLOSSCAPA) {
+ capa = req_capsule_client_get(&req->rq_pill,
+ &RMF_CAPA1);
+ if (capa == NULL) {
CERROR("Missing capability for OST PUNCH");
- RETURN (-EFAULT);
+ GOTO(unlock, rc = -EFAULT);
}
}
- req->rq_status = obd_punch(exp, &oinfo, oti, NULL);
+
+ OBD_ALLOC_PTR(oinfo);
+ if (!oinfo)
+ GOTO(unlock, rc = -ENOMEM);
+ oinfo->oi_oa = &body->oa;
+ oinfo->oi_policy.l_extent.start = oinfo->oi_oa->o_size;
+ oinfo->oi_policy.l_extent.end = oinfo->oi_oa->o_blocks;
+ oinfo->oi_capa = capa;
+ oinfo->oi_flags = OBD_FL_PUNCH;
+
+ req->rq_status = obd_punch(exp, oinfo, oti, NULL);
+ OBD_FREE_PTR(oinfo);
+unlock:
ost_lock_put(exp, &lh, LCK_PW);
}
- repbody->oa = *oinfo.oi_oa;
+
+ repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
+ repbody->oa = body->oa;
ost_drop_id(exp, &repbody->oa);
RETURN(rc);
}
static int ost_sync(struct obd_export *exp, struct ptlrpc_request *req)
{
struct ost_body *body, *repbody;
+ struct obd_info *oinfo;
struct lustre_capa *capa = NULL;
int rc;
ENTRY;
if (rc)
RETURN(rc);
+ OBD_ALLOC_PTR(oinfo);
+ if (!oinfo)
+ RETURN(-ENOMEM);
+
+ oinfo->oi_oa = &body->oa;
+ oinfo->oi_capa = capa;
+ req->rq_status = obd_sync(exp, oinfo, body->oa.o_size,
+ body->oa.o_blocks, NULL);
+ OBD_FREE_PTR(oinfo);
+
repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
- memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
- req->rq_status = obd_sync(exp, &repbody->oa, NULL, repbody->oa.o_size,
- repbody->oa.o_blocks, capa);
+ repbody->oa = body->oa;
ost_drop_id(exp, &repbody->oa);
RETURN(0);
}
struct obd_trans_info *oti)
{
struct ost_body *body, *repbody;
+ struct obd_info *oinfo;
+ struct lustre_capa *capa = NULL;
int rc;
- struct obd_info oinfo = { { { 0 } } };
ENTRY;
body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
if (rc)
RETURN(rc);
- repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
- repbody->oa = body->oa;
-
- oinfo.oi_oa = &repbody->oa;
- if (oinfo.oi_oa->o_valid & OBD_MD_FLOSSCAPA) {
- oinfo.oi_capa = req_capsule_client_get(&req->rq_pill,
- &RMF_CAPA1);
- if (oinfo.oi_capa == NULL) {
+ if (body->oa.o_valid & OBD_MD_FLOSSCAPA) {
+ capa = req_capsule_client_get(&req->rq_pill, &RMF_CAPA1);
+ if (capa == NULL) {
CERROR("Missing capability for OST SETATTR");
RETURN (-EFAULT);
}
}
- req->rq_status = obd_setattr(exp, &oinfo, oti);
+
+ OBD_ALLOC_PTR(oinfo);
+ if (!oinfo)
+ RETURN(-ENOMEM);
+ oinfo->oi_oa = &body->oa;
+ oinfo->oi_capa = capa;
+
+ req->rq_status = obd_setattr(exp, oinfo, oti);
+
+ OBD_FREE_PTR(oinfo);
+
+ repbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
+ repbody->oa = body->oa;
ost_drop_id(exp, &repbody->oa);
RETURN(0);
}
-static int ost_bulk_timeout(void *data)
-{
- ENTRY;
- /* We don't fail the connection here, because having the export
- * killed makes the (vital) call to commitrw very sad.
- */
- RETURN(1);
-}
-
static __u32 ost_checksum_bulk(struct ptlrpc_bulk_desc *desc, int opc,
cksum_type_t cksum_type)
{
kunmap(page);
}
- return cksum;
+ return fini_checksum(cksum, cksum_type);
}
static int ost_brw_lock_get(int mode, struct obd_export *exp,
}
if (body->oa.o_valid & OBD_MD_FLCKSUM) {
- cksum_type_t cksum_type = OBD_CKSUM_CRC32;
-
- if (body->oa.o_valid & OBD_MD_FLFLAGS)
- cksum_type = cksum_type_unpack(body->oa.o_flags);
+ cksum_type_t cksum_type =
+ cksum_type_unpack(body->oa.o_valid & OBD_MD_FLFLAGS ?
+ body->oa.o_flags : 0);
body->oa.o_flags = cksum_type_pack(cksum_type);
body->oa.o_valid = OBD_MD_FLCKSUM | OBD_MD_FLFLAGS;
- body->oa.o_cksum = ost_checksum_bulk(desc, OST_READ, cksum_type);
+ body->oa.o_cksum = ost_checksum_bulk(desc, OST_READ,cksum_type);
CDEBUG(D_PAGE,"checksum at read origin: %x\n",body->oa.o_cksum);
} else {
body->oa.o_valid = 0;
/* Check if client was evicted while we were doing i/o before touching
network */
if (rc == 0) {
- /* Check if there is eviction in progress, and if so, wait for
- * it to finish */
- if (unlikely(cfs_atomic_read(&exp->exp_obd->
- obd_evict_inprogress))) {
- lwi = LWI_INTR(NULL, NULL);
- rc = l_wait_event(exp->exp_obd->
- obd_evict_inprogress_waitq,
- !cfs_atomic_read(&exp->exp_obd->
- obd_evict_inprogress),
- &lwi);
- }
- /* Check if client was evicted or tried to reconnect already */
- if (exp->exp_failed || exp->exp_abort_active_req)
- rc = -ENOTCONN;
- else {
- rc = sptlrpc_svc_wrap_bulk(req, desc);
- if (rc == 0)
- rc = ptlrpc_start_bulk_transfer(desc);
- }
-
- if (rc == 0) {
- time_t start = cfs_time_current_sec();
- do {
- long timeoutl = req->rq_deadline -
- cfs_time_current_sec();
- cfs_duration_t timeout = timeoutl <= 0 ?
- CFS_TICK : cfs_time_seconds(timeoutl);
- lwi = LWI_TIMEOUT_INTERVAL(timeout,
- cfs_time_seconds(1),
- ost_bulk_timeout,
- desc);
- rc = l_wait_event(desc->bd_waitq,
- !ptlrpc_server_bulk_active(desc) ||
- exp->exp_failed ||
- exp->exp_abort_active_req,
- &lwi);
- LASSERT(rc == 0 || rc == -ETIMEDOUT);
- /* Wait again if we changed deadline */
- } while ((rc == -ETIMEDOUT) &&
- (req->rq_deadline > cfs_time_current_sec()));
-
- if (rc == -ETIMEDOUT) {
- DEBUG_REQ(D_ERROR, req,
- "timeout on bulk PUT after %ld%+lds",
- req->rq_deadline - start,
- cfs_time_current_sec() -
- req->rq_deadline);
- ptlrpc_abort_bulk(desc);
- } else if (exp->exp_failed) {
- DEBUG_REQ(D_ERROR, req, "Eviction on bulk PUT");
- rc = -ENOTCONN;
- ptlrpc_abort_bulk(desc);
- } else if (exp->exp_abort_active_req) {
- DEBUG_REQ(D_ERROR, req, "Reconnect on bulk PUT");
- /* we don't reply anyway */
- rc = -ETIMEDOUT;
- ptlrpc_abort_bulk(desc);
- } else if (!desc->bd_success ||
- desc->bd_nob_transferred != desc->bd_nob) {
- DEBUG_REQ(D_ERROR, req, "%s bulk PUT %d(%d)",
- desc->bd_success ?
- "truncated" : "network error on",
- desc->bd_nob_transferred,
- desc->bd_nob);
- /* XXX should this be a different errno? */
- rc = -ETIMEDOUT;
- }
- } else {
- DEBUG_REQ(D_ERROR, req, "bulk PUT failed: rc %d", rc);
- }
+ rc = target_bulk_io(exp, desc, &lwi);
no_reply = rc != 0;
}
/* pause before transaction has been started */
OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK, (obd_timeout + 1) / 4);
- /* Check if there is eviction in progress, and if so, wait for it to
- * finish */
- if (unlikely(cfs_atomic_read(&exp->exp_obd->obd_evict_inprogress))) {
- lwi = LWI_INTR(NULL, NULL); // We do not care how long it takes
- rc = l_wait_event(exp->exp_obd->obd_evict_inprogress_waitq,
- !cfs_atomic_read(&exp->exp_obd->obd_evict_inprogress),
- &lwi);
- }
- if (exp->exp_failed)
- GOTO(out, rc = -ENOTCONN);
-
/* ost_body, ioobj & noibuf_remote are verified and swabbed in
* ost_rw_hpreq_check(). */
body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
rc = req_capsule_server_pack(&req->rq_pill);
if (rc != 0)
GOTO(out, rc);
- OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_PACK, obd_fail_val);
+ CFS_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_PACK, cfs_fail_val);
rcs = req_capsule_server_get(&req->rq_pill, &RMF_RCS);
tls = ost_tls_get(req);
if (rc != 0)
GOTO(out_lock, rc);
- /* Check if client was evicted or tried to reconnect while we
- * were doing i/o before touching network */
- if (desc->bd_export->exp_failed ||
- desc->bd_export->exp_abort_active_req)
- rc = -ENOTCONN;
- else
- rc = ptlrpc_start_bulk_transfer(desc);
- if (rc == 0) {
- time_t start = cfs_time_current_sec();
- do {
- long timeoutl = req->rq_deadline -
- cfs_time_current_sec();
- cfs_duration_t timeout = timeoutl <= 0 ?
- CFS_TICK : cfs_time_seconds(timeoutl);
- lwi = LWI_TIMEOUT_INTERVAL(timeout, cfs_time_seconds(1),
- ost_bulk_timeout, desc);
- rc = l_wait_event(desc->bd_waitq,
- !ptlrpc_server_bulk_active(desc) ||
- desc->bd_export->exp_failed ||
- desc->bd_export->exp_abort_active_req,
- &lwi);
- LASSERT(rc == 0 || rc == -ETIMEDOUT);
- /* Wait again if we changed deadline */
- } while ((rc == -ETIMEDOUT) &&
- (req->rq_deadline > cfs_time_current_sec()));
-
- if (rc == -ETIMEDOUT) {
- DEBUG_REQ(D_ERROR, req,
- "timeout on bulk GET after %ld%+lds",
- req->rq_deadline - start,
- cfs_time_current_sec() -
- req->rq_deadline);
- ptlrpc_abort_bulk(desc);
- } else if (desc->bd_export->exp_failed) {
- DEBUG_REQ(D_ERROR, req, "Eviction on bulk GET");
- rc = -ENOTCONN;
- ptlrpc_abort_bulk(desc);
- } else if (desc->bd_export->exp_abort_active_req) {
- DEBUG_REQ(D_ERROR, req, "Reconnect on bulk GET");
- /* we don't reply anyway */
- rc = -ETIMEDOUT;
- ptlrpc_abort_bulk(desc);
- } else if (!desc->bd_success) {
- DEBUG_REQ(D_ERROR, req, "network error on bulk GET");
- /* XXX should this be a different errno? */
- rc = -ETIMEDOUT;
- } else {
- rc = sptlrpc_svc_unwrap_bulk(req, desc);
- }
- } else {
- DEBUG_REQ(D_ERROR, req, "ptlrpc_bulk_get failed: rc %d", rc);
- }
+ rc = target_bulk_io(exp, desc, &lwi);
no_reply = rc != 0;
skip_transfer:
(sync_lock_cancel == ALWAYS_SYNC_ON_CANCEL ||
(sync_lock_cancel == BLOCKING_SYNC_ON_CANCEL &&
lock->l_flags & LDLM_FL_CBPENDING))) {
+ struct obd_info *oinfo;
struct obdo *oa;
int rc;
+ OBD_ALLOC_PTR(oinfo);
+ if (!oinfo)
+ RETURN(-ENOMEM);
OBDO_ALLOC(oa);
+ if (!oa) {
+ OBD_FREE_PTR(oinfo);
+ RETURN(-ENOMEM);
+ }
oa->o_id = lock->l_resource->lr_name.name[0];
oa->o_seq = lock->l_resource->lr_name.name[1];
oa->o_valid = OBD_MD_FLID|OBD_MD_FLGROUP;
+ oinfo->oi_oa = oa;
- rc = obd_sync(lock->l_export, oa, NULL,
+ rc = obd_sync(lock->l_export, oinfo,
lock->l_policy_data.l_extent.start,
lock->l_policy_data.l_extent.end, NULL);
if (rc)
CERROR("Error %d syncing data on lock cancel\n", rc);
OBDO_FREE(oa);
+ OBD_FREE_PTR(oinfo);
}
- return ldlm_server_blocking_ast(lock, desc, data, flag);
+ rc = ldlm_server_blocking_ast(lock, desc, data, flag);
+ RETURN(rc);
}
static int ost_filter_recovery_request(struct ptlrpc_request *req,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff