#include <linux/lustre_net.h>
#include <linux/lustre_dlm.h>
#include <linux/init.h>
+#include <linux/lprocfs_status.h>
+
+extern lprocfs_vars_t status_var_nm_1[];
+extern lprocfs_vars_t status_class_var[];
static int ost_destroy(struct ptlrpc_request *req)
{
RETURN(rc);
repbody = lustre_msg_buf(req->rq_repmsg, 0);
+ /* FIXME: unpack only valid fields instead of memcpy, endianness */
memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
req->rq_status = obd_getattr(conn, &repbody->oa, NULL);
RETURN(0);
{
struct lustre_handle *conn = (struct lustre_handle *)req->rq_reqmsg;
struct obd_statfs *osfs;
- struct statfs sfs;
int rc, size = sizeof(*osfs);
ENTRY;
- rc = obd_statfs(conn, &sfs);
- if (rc) {
- CERROR("ost: statfs failed: rc %d\n", rc);
- req->rq_status = rc;
- RETURN(rc);
- }
-
rc = lustre_pack_msg(1, &size, NULL, &req->rq_replen, &req->rq_repmsg);
if (rc)
RETURN(rc);
osfs = lustre_msg_buf(req->rq_repmsg, 0);
memset(osfs, 0, size);
- obd_statfs_pack(osfs, &sfs);
+
+ rc = obd_statfs(conn, osfs);
+ if (rc) {
+ CERROR("ost: statfs failed: rc %d\n", rc);
+ req->rq_status = rc;
+ RETURN(rc);
+ }
+ obd_statfs_pack(osfs, osfs);
+
RETURN(0);
}
RETURN(rc);
repbody = lustre_msg_buf(req->rq_repmsg, 0);
+ /* FIXME: unpack only valid fields instead of memcpy, endianness */
memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
req->rq_status = obd_open(conn, &repbody->oa, NULL);
RETURN(0);
RETURN(rc);
repbody = lustre_msg_buf(req->rq_repmsg, 0);
+ /* FIXME: unpack only valid fields instead of memcpy, endianness */
memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
req->rq_status = obd_close(conn, &repbody->oa, NULL);
RETURN(0);
RETURN(rc);
repbody = lustre_msg_buf(req->rq_repmsg, 0);
+ /* FIXME: unpack only valid fields instead of memcpy, endianness */
memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
req->rq_status = obd_create(conn, &repbody->oa, NULL);
RETURN(0);
body = lustre_msg_buf(req->rq_reqmsg, 0);
+ if ((NTOH__u32(body->oa.o_valid) & (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS))!=
+ (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS))
+ RETURN(-EINVAL);
+
rc = lustre_pack_msg(1, &size, NULL, &req->rq_replen, &req->rq_repmsg);
if (rc)
RETURN(rc);
repbody = lustre_msg_buf(req->rq_repmsg, 0);
+ /* FIXME: unpack only valid fields instead of memcpy, endianness */
memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
- req->rq_status = obd_punch(conn, &repbody->oa, NULL,
- repbody->oa.o_blocks, repbody->oa.o_size);
+ req->rq_status = obd_punch(conn, &repbody->oa, NULL,
+ repbody->oa.o_size, repbody->oa.o_blocks);
RETURN(0);
}
RETURN(rc);
repbody = lustre_msg_buf(req->rq_repmsg, 0);
+ /* FIXME: unpack only valid fields instead of memcpy, endianness */
memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
req->rq_status = obd_setattr(conn, &repbody->oa, NULL);
RETURN(0);
}
+static int ost_bulk_timeout(void *data)
+{
+ struct ptlrpc_bulk_desc *desc = data;
+
+ ENTRY;
+ CERROR("(not yet) starting recovery of client %p\n", desc->bd_client);
+ RETURN(1);
+}
+
static int ost_brw_read(struct ptlrpc_request *req)
{
struct lustre_handle *conn = (struct lustre_handle *)req->rq_reqmsg;
struct niobuf_local *local_nb = NULL;
struct obd_ioobj *ioo;
struct ost_body *body;
+ struct l_wait_info lwi;
+ void *desc_priv = NULL;
int rc, cmd, i, j, objcount, niocount, size = sizeof(*body);
ENTRY;
niocount = req->rq_reqmsg->buflens[2] / sizeof(*remote_nb);
cmd = OBD_BRW_READ;
+ if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_READ_BULK))
+ GOTO(out, rc = 0);
+
for (i = 0; i < objcount; i++) {
ost_unpack_ioo(&tmp1, &ioo);
if (tmp2 + ioo->ioo_bufcnt > end2) {
ost_unpack_niobuf(&tmp2, &remote_nb);
}
- rc = lustre_pack_msg(1, &size, NULL, &req->rq_replen, &req->rq_repmsg);
- if (rc)
- RETURN(rc);
OBD_ALLOC(local_nb, sizeof(*local_nb) * niocount);
if (local_nb == NULL)
- RETURN(-ENOMEM);
+ GOTO(out, rc = -ENOMEM);
/* The unpackers move tmp1 and tmp2, so reset them before using */
- tmp1 = lustre_msg_buf(req->rq_reqmsg, 1);
- tmp2 = lustre_msg_buf(req->rq_reqmsg, 2);
- req->rq_status = obd_preprw(cmd, conn, objcount,
- tmp1, niocount, tmp2, local_nb, NULL);
+ ioo = lustre_msg_buf(req->rq_reqmsg, 1);
+ remote_nb = lustre_msg_buf(req->rq_reqmsg, 2);
+ req->rq_status = obd_preprw(cmd, conn, objcount, ioo, niocount,
+ remote_nb, local_nb, &desc_priv);
if (req->rq_status)
- GOTO(out_local, 0);
+ GOTO(out, rc = 0);
desc = ptlrpc_prep_bulk(req->rq_connection);
if (desc == NULL)
GOTO(out_local, rc = -ENOMEM);
- desc->b_portal = OST_BULK_PORTAL;
+ desc->bd_portal = OST_BULK_PORTAL;
for (i = 0; i < niocount; i++) {
- struct ptlrpc_bulk_page *bulk;
- bulk = ptlrpc_prep_bulk_page(desc);
+ struct ptlrpc_bulk_page *bulk = ptlrpc_prep_bulk_page(desc);
+
if (bulk == NULL)
GOTO(out_bulk, rc = -ENOMEM);
- remote_nb = &(((struct niobuf_remote *)tmp2)[i]);
- bulk->b_xid = remote_nb->xid;
- bulk->b_buf = (void *)(unsigned long)local_nb[i].addr;
- bulk->b_buflen = PAGE_SIZE;
+ bulk->bp_xid = remote_nb[i].xid;
+ bulk->bp_buf = local_nb[i].addr;
+ bulk->bp_buflen = remote_nb[i].len;
}
rc = ptlrpc_send_bulk(desc);
if (rc)
GOTO(out_bulk, rc);
-#warning OST must time out here.
- wait_event(desc->b_waitq, ptlrpc_check_bulk_sent(desc));
- if (desc->b_flags & PTL_RPC_FL_INTR)
- rc = -EINTR;
+ lwi = LWI_TIMEOUT(obd_timeout * HZ, ost_bulk_timeout, desc);
+ rc = l_wait_event(desc->bd_waitq, desc->bd_flags &PTL_BULK_FL_SENT, &lwi);
+ if (rc) {
+ LASSERT(rc == -ETIMEDOUT);
+ GOTO(out_bulk, rc);
+ }
+
+ req->rq_status = obd_commitrw(cmd, conn, objcount, ioo, niocount,
+ local_nb, desc_priv);
- /* The unpackers move tmp1 and tmp2, so reset them before using */
- tmp1 = lustre_msg_buf(req->rq_reqmsg, 1);
- tmp2 = lustre_msg_buf(req->rq_reqmsg, 2);
- req->rq_status = obd_commitrw(cmd, conn, objcount,
- tmp1, niocount, local_nb, NULL);
+ rc = lustre_pack_msg(1, &size, NULL, &req->rq_replen, &req->rq_repmsg);
out_bulk:
ptlrpc_free_bulk(desc);
out_local:
OBD_FREE(local_nb, sizeof(*local_nb) * niocount);
out:
- if (rc)
+ if (rc) {
+ /* It's a lot of work to delay allocating the reply, and a lot
+ * less work to just free it here. */
+ OBD_FREE(req->rq_repmsg, req->rq_replen);
+ req->rq_repmsg = NULL;
ptlrpc_error(req->rq_svc, req);
- else
+ } else
ptlrpc_reply(req->rq_svc, req);
RETURN(rc);
}
void *desc_priv = NULL;
int reply_sent = 0;
struct ptlrpc_service *srv;
+ struct l_wait_info lwi;
__u32 xid;
ENTRY;
/* The unpackers move tmp1 and tmp2, so reset them before using */
tmp1 = lustre_msg_buf(req->rq_reqmsg, 1);
tmp2 = lustre_msg_buf(req->rq_reqmsg, 2);
- req->rq_status = obd_preprw(cmd, conn, objcount,
- tmp1, niocount, tmp2, local_nb, &desc_priv);
+ req->rq_status = obd_preprw(cmd, conn, objcount, tmp1, niocount, tmp2,
+ local_nb, &desc_priv);
if (req->rq_status)
GOTO(out_free, rc = 0); /* XXX is this correct? */
+ if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK))
+ GOTO(fail_preprw, rc = 0);
+
desc = ptlrpc_prep_bulk(req->rq_connection);
if (desc == NULL)
GOTO(fail_preprw, rc = -ENOMEM);
- desc->b_cb = NULL;
- desc->b_portal = OSC_BULK_PORTAL;
- desc->b_desc_private = desc_priv;
- memcpy(&(desc->b_conn), &conn, sizeof(conn));
+ desc->bd_cb = NULL;
+ desc->bd_portal = OSC_BULK_PORTAL;
+ desc->bd_desc_private = desc_priv;
+ memcpy(&(desc->bd_conn), &conn, sizeof(conn));
srv = req->rq_obd->u.ost.ost_service;
spin_lock(&srv->srv_lock);
if (bulk == NULL)
GOTO(fail_bulk, rc = -ENOMEM);
- bulk->b_xid = xid; /* single xid for all pages */
+ bulk->bp_xid = xid; /* single xid for all pages */
- bulk->b_buf = lnb->addr;
- bulk->b_page = lnb->page;
- bulk->b_flags = lnb->flags;
- bulk->b_dentry = lnb->dentry;
- bulk->b_buflen = PAGE_SIZE;
- bulk->b_cb = NULL;
+ bulk->bp_buf = lnb->addr;
+ bulk->bp_page = lnb->page;
+ bulk->bp_flags = lnb->flags;
+ bulk->bp_dentry = lnb->dentry;
+ bulk->bp_buflen = lnb->len;
+ bulk->bp_cb = NULL;
/* this advances remote_nb */
ost_pack_niobuf((void **)&remote_nb, lnb->offset, lnb->len, 0,
- bulk->b_xid);
+ bulk->bp_xid);
}
rc = ptlrpc_register_bulk(desc);
reply_sent = 1;
ptlrpc_reply(req->rq_svc, req);
-#warning OST must time out here.
- wait_event(desc->b_waitq, desc->b_flags & PTL_BULK_FL_RCVD);
+ lwi = LWI_TIMEOUT(obd_timeout * HZ, ost_bulk_timeout, desc);
+ rc = l_wait_event(desc->bd_waitq, desc->bd_flags & PTL_BULK_FL_RCVD,
+ &lwi);
+ if (rc) {
+ if (rc != -ETIMEDOUT)
+ LBUG();
+ GOTO(fail_bulk, rc);
+ }
rc = obd_commitrw(cmd, conn, objcount, tmp1, niocount, local_nb,
- desc->b_desc_private);
+ desc->bd_desc_private);
ptlrpc_free_bulk(desc);
EXIT;
out_free:
OBD_FREE(local_nb, niocount * sizeof(*local_nb));
out:
if (!reply_sent) {
- if (rc)
+ if (rc) {
+ OBD_FREE(req->rq_repmsg, req->rq_replen);
+ req->rq_repmsg = NULL;
ptlrpc_error(req->rq_svc, req);
- else
+ } else
ptlrpc_reply(req->rq_svc, req);
}
return rc;
GOTO(out, rc);
}
- if (req->rq_reqmsg->type != PTL_RPC_MSG_REQUEST) {
- CERROR("lustre_ost: wrong packet type sent %d\n",
- req->rq_reqmsg->type);
- GOTO(out, rc = -EINVAL);
- }
-
if (req->rq_reqmsg->opc != OST_CONNECT &&
req->rq_export == NULL) {
CERROR("lustre_ost: operation %d on unconnected OST\n",
rc = ost_setattr(req);
break;
case OST_OPEN:
- CDEBUG(D_INODE, "setattr\n");
+ CDEBUG(D_INODE, "open\n");
OBD_FAIL_RETURN(OBD_FAIL_OST_OPEN_NET, 0);
rc = ost_open(req);
break;
case OST_CLOSE:
- CDEBUG(D_INODE, "setattr\n");
+ CDEBUG(D_INODE, "close\n");
OBD_FAIL_RETURN(OBD_FAIL_OST_CLOSE_NET, 0);
rc = ost_close(req);
break;
GOTO(error_dec, err = -EINVAL);
}
- err = obd_connect(&ost->ost_conn, tgt, NULL);
+ err = obd_connect(&ost->ost_conn, tgt, NULL, NULL, NULL);
if (err) {
CERROR("fail to connect to device %d\n", data->ioc_dev);
GOTO(error_dec, err = -EINVAL);
}
- ost->ost_service = ptlrpc_init_svc(64 * 1024, OST_REQUEST_PORTAL,
- OSC_REPLY_PORTAL, "self",ost_handle);
+ ost->ost_service = ptlrpc_init_svc(OST_NEVENTS, OST_NBUFS,
+ OST_BUFSIZE, OST_MAXREQSIZE,
+ OST_REQUEST_PORTAL, OSC_REPLY_PORTAL,
+ "self", ost_handle, "ost");
if (!ost->ost_service) {
CERROR("failed to start service\n");
GOTO(error_disc, err = -EINVAL);
MOD_DEC_USE_COUNT;
RETURN(0);
}
+int ost_attach(struct obd_device *dev,
+ obd_count len, void *data)
+{
+ /* lprocfs_reg_dev(dev, (lprocfs_group_t*)lprocfs_ptlrpc_nm,
+ sizeof(struct lprofiler_ptlrpc));
+ */
+ lprocfs_reg_obd(dev, (lprocfs_vars_t*)status_var_nm_1, (void*)dev);
+ return 0;
+}
+
+int ost_detach(struct obd_device *dev)
+{
+ /* lprocfs_dereg_dev(dev); */
+ lprocfs_dereg_obd(dev);
+ return 0;
+
+}
+
+
/* use obd ops to offer management infrastructure */
static struct obd_ops ost_obd_ops = {
+ o_attach: ost_attach,
+ o_detach: ost_detach,
o_setup: ost_setup,
o_cleanup: ost_cleanup,
};
static int __init ost_init(void)
{
- class_register_type(&ost_obd_ops, LUSTRE_OST_NAME);
+ int rc;
+
+ rc = class_register_type(&ost_obd_ops,
+ (lprocfs_vars_t*)status_class_var,
+ LUSTRE_OST_NAME);
+ if (rc) RETURN(rc);
+
return 0;
+
}
static void __exit ost_exit(void)
{
+
class_unregister_type(LUSTRE_OST_NAME);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff