-/*
- * Copryright (C) 2001 Cluster File Systems, Inc.
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copryright (C) 2001, 2002 Cluster File Systems, Inc.
+ *
+ * This code is issued under the GNU General Public License.
+ * See the file COPYING in this distribution
+ *
+ * Author Peter Braam <braam@clusterfs.com>
+ *
+ * This server is single threaded at present (but can easily be multi
+ * threaded). For testing and management it is treated as an
+ * obd_device, although it does not export a full OBD method table
+ * (the requests are coming in over the wire, so object target
+ * modules do not have a full method table.)
*
*/
#include <linux/fs.h>
#include <linux/stat.h>
#include <asm/uaccess.h>
-#include <linux/vmalloc.h>
#include <asm/segment.h>
#include <linux/miscdevice.h>
-#include <linux/obd_support.h>
+#define DEBUG_SUBSYSTEM S_OSC
+
#include <linux/obd_class.h>
#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
+#include <linux/lustre_net.h>
+#include <linux/obd_ost.h>
-extern int ost_queue_req(struct obd_device *, struct ost_request *);
+struct ptlrpc_client *osc_con2cl(struct obd_conn *conn)
+{
+ struct osc_obd *osc = &conn->oc_dev->u.osc;
+ return osc->osc_client;
+}
-struct ost_request *osc_prep_req(int size, int opcode)
+static int osc_connect(struct obd_conn *conn)
{
- struct ost_request *request;
- int rc;
- ENTRY;
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
+
+ request = ptlrpc_prep_req(cl, OST_CONNECT, 0, NULL, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
- request = (struct ost_request *)kmalloc(sizeof(*request), GFP_KERNEL);
- if (!request) {
- printk("osc_getattr: request allocation out of memory\n");
- return NULL;
- }
+ request->rq_replen = lustre_msg_size(1, &size);
- rc = ost_pack_req(NULL, 0, NULL, 0,
- &request->rq_reqhdr, &request->rq_req,
- &request->rq_reqlen, &request->rq_reqbuf);
- if (rc) {
- printk("llight request: cannot pack request %d\n", rc);
- return NULL;
- }
- request->rq_reqhdr->opc = opcode;
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
- EXIT;
- return request;
+ body = lustre_msg_buf(request->rq_repmsg, 0);
+ CDEBUG(D_INODE, "received connid %d\n", body->connid);
+
+ conn->oc_id = body->connid;
+ EXIT;
+ out:
+ ptlrpc_free_req(request);
+ return rc;
}
-extern int osc_queue_wait(struct obd_conn *conn, struct ost_request *req)
+static int osc_disconnect(struct obd_conn *conn)
{
- struct obd_device *client = conn->oc_dev;
- struct obd_device *target = client->u.osc.osc_tgt;
- int rc;
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
- ENTRY;
- /* set the connection id */
- req->rq_req->connid = conn->oc_id;
+ request = ptlrpc_prep_req(cl, OST_DISCONNECT, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
- CDEBUG(D_INODE, "tgt at %p, conn id %d, opcode %d request at: %p\n",
- &conn->oc_dev->u.osc.osc_tgt->u.ost,
- conn->oc_id, req->rq_reqhdr->opc, req);
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ body->connid = conn->oc_id;
- /* XXX fix the race here (wait_for_event?)*/
- /* hand the packet over to the server */
- rc = ost_queue_req(target, req);
- if (rc) {
- printk("osc_queue_wait: error %d, opcode %d\n", rc,
- req->rq_reqhdr->opc);
- return -rc;
- }
+ request->rq_replen = lustre_msg_size(1, &size);
- /* wait for the reply */
- init_waitqueue_head(&req->rq_wait_for_rep);
- interruptible_sleep_on(&req->rq_wait_for_rep);
+ rc = ptlrpc_queue_wait(cl, request);
+ GOTO(out, rc);
+ out:
+ ptlrpc_free_req(request);
+ return rc;
+}
+
+static int osc_getattr(struct obd_conn *conn, struct obdo *oa)
+{
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
- ost_unpack_rep(req->rq_repbuf, req->rq_replen, &req->rq_rephdr,
- &req->rq_rep);
- printk("-->osc_queue_wait: buf %p len %d status %d\n",
- req->rq_repbuf, req->rq_replen, req->rq_rephdr->status);
+ request = ptlrpc_prep_req(cl, OST_GETATTR, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
- EXIT;
- return req->rq_rephdr->status;
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ memcpy(&body->oa, oa, sizeof(*oa));
+ body->connid = conn->oc_id;
+ body->oa.o_valid = ~0;
+
+ request->rq_replen = lustre_msg_size(1, &size);
+
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
+
+ body = lustre_msg_buf(request->rq_repmsg, 0);
+ CDEBUG(D_INODE, "mode: %o\n", body->oa.o_mode);
+ if (oa)
+ memcpy(oa, &body->oa, sizeof(*oa));
+
+ EXIT;
+ out:
+ ptlrpc_free_req(request);
+ return 0;
}
-void osc_free_req(struct ost_request *request)
+static int osc_open(struct obd_conn *conn, struct obdo *oa)
{
- if (request->rq_repbuf)
- kfree(request->rq_repbuf);
- kfree(request);
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
+
+ request = ptlrpc_prep_req(cl, OST_OPEN, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
+
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ memcpy(&body->oa, oa, sizeof(*oa));
+ body->connid = conn->oc_id;
+ if (body->oa.o_valid != (OBD_MD_FLMODE | OBD_MD_FLID))
+ LBUG();
+
+ request->rq_replen = lustre_msg_size(1, &size);
+
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
+
+ body = lustre_msg_buf(request->rq_repmsg, 0);
+ CDEBUG(D_INODE, "mode: %o\n", body->oa.o_mode);
+ if (oa)
+ memcpy(oa, &body->oa, sizeof(*oa));
+
+ EXIT;
+ out:
+ ptlrpc_free_req(request);
+ return 0;
}
+static int osc_close(struct obd_conn *conn, struct obdo *oa)
+{
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
+
+ request = ptlrpc_prep_req(cl, OST_CLOSE, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
+
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ memcpy(&body->oa, oa, sizeof(*oa));
+ body->connid = conn->oc_id;
+
+ request->rq_replen = lustre_msg_size(1, &size);
-int osc_connect(struct obd_conn *conn)
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
+
+ body = lustre_msg_buf(request->rq_repmsg, 0);
+ CDEBUG(D_INODE, "mode: %o\n", body->oa.o_mode);
+ if (oa)
+ memcpy(oa, &body->oa, sizeof(*oa));
+
+ EXIT;
+ out:
+ ptlrpc_free_req(request);
+ return 0;
+}
+
+static int osc_setattr(struct obd_conn *conn, struct obdo *oa)
{
- struct ost_request *request;
- int rc;
- ENTRY;
-
- request = osc_prep_req(sizeof(*request), OST_CONNECT);
- if (!request) {
- printk("osc_connect: cannot pack req!\n");
- return -ENOMEM;
- }
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
- rc = osc_queue_wait(conn, request);
- if (rc) {
- EXIT;
- goto out;
- }
-
- CDEBUG(D_INODE, "received connid %d\n", request->rq_rep->connid);
+ request = ptlrpc_prep_req(cl, OST_SETATTR, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
+
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ memcpy(&body->oa, oa, sizeof(*oa));
+ body->connid = conn->oc_id;
+
+ request->rq_replen = lustre_msg_size(1, &size);
+
+ rc = ptlrpc_queue_wait(cl, request);
+ GOTO(out, rc);
- conn->oc_id = request->rq_rep->connid;
out:
- osc_free_req(request);
- EXIT;
- return rc;
-}
-
-int osc_getattr(struct obd_conn *conn, struct obdo *oa)
-{
- struct ost_request *request;
- int rc;
-
- request = osc_prep_req(sizeof(*request), OST_GETATTR);
- if (!request) {
- printk("osc_connect: cannot pack req!\n");
- return -ENOMEM;
- }
-
- memcpy(&request->rq_req->oa, oa, sizeof(*oa));
- request->rq_req->oa.o_valid = ~0;
-
- rc = osc_queue_wait(conn, request);
- if (rc) {
- EXIT;
- goto out;
- }
-
- CDEBUG(D_INODE, "mode: %o\n", request->rq_rep->oa.o_mode);
- if (oa) {
- memcpy(oa, &request->rq_rep->oa, sizeof(*oa));
- }
+ ptlrpc_free_req(request);
+ return 0;
+}
+
+static int osc_create(struct obd_conn *conn, struct obdo *oa)
+{
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
+
+ if (!oa) {
+ CERROR("oa NULL\n");
+ RETURN(-EINVAL);
+ }
+ request = ptlrpc_prep_req(cl, OST_CREATE, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
+
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ memcpy(&body->oa, oa, sizeof(*oa));
+ body->oa.o_valid = ~0;
+ body->connid = conn->oc_id;
+
+ request->rq_replen = lustre_msg_size(1, &size);
+
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
+ body = lustre_msg_buf(request->rq_repmsg, 0);
+ memcpy(oa, &body->oa, sizeof(*oa));
+
+ EXIT;
out:
- osc_free_req(request);
- return 0;
+ ptlrpc_free_req(request);
+ return 0;
}
+static int osc_punch(struct obd_conn *conn, struct obdo *oa, obd_size count,
+ obd_off offset)
+{
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
-/* mount the file system (secretly) */
-static int osc_setup(struct obd_device *obddev, obd_count len,
- void *buf)
-
+ if (!oa) {
+ CERROR("oa NULL\n");
+ RETURN(-EINVAL);
+ }
+ request = ptlrpc_prep_req(cl, OST_PUNCH, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
+
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ memcpy(&body->oa, oa, sizeof(*oa));
+ body->connid = conn->oc_id;
+ body->oa.o_valid = ~0;
+ body->oa.o_size = offset;
+ body->oa.o_blocks = count;
+
+ request->rq_replen = lustre_msg_size(1, &size);
+
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
+
+ body = lustre_msg_buf(request->rq_repmsg, 0);
+ memcpy(oa, &body->oa, sizeof(*oa));
+
+ EXIT;
+ out:
+ ptlrpc_free_req(request);
+ return 0;
+}
+
+static int osc_destroy(struct obd_conn *conn, struct obdo *oa)
{
- struct obd_ioctl_data* data = buf;
- struct osc_obd *osc = &obddev->u.osc;
+ struct ptlrpc_request *request;
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ost_body *body;
+ int rc, size = sizeof(*body);
ENTRY;
- if (data->ioc_dev < 0 || data->ioc_dev > MAX_OBD_DEVICES) {
- EXIT;
- return -ENODEV;
- }
-
- osc->osc_tgt = &obd_dev[data->ioc_dev];
- printk("OSC: tgt %d ost at %p\n", data->ioc_dev, &osc->osc_tgt->u.ost);
- if ( ! (osc->osc_tgt->obd_flags & OBD_ATTACHED) ||
- ! (osc->osc_tgt->obd_flags & OBD_SET_UP) ){
- printk("device not attached or not set up (%d)\n",
- data->ioc_dev);
- EXIT;
- return -EINVAL;
- }
-
- MOD_INC_USE_COUNT;
- EXIT;
+ if (!oa) {
+ CERROR("oa NULL\n");
+ RETURN(-EINVAL);
+ }
+ request = ptlrpc_prep_req(cl, OST_DESTROY, 1, &size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
+
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ memcpy(&body->oa, oa, sizeof(*oa));
+ body->connid = conn->oc_id;
+ body->oa.o_valid = ~0;
+
+ request->rq_replen = lustre_msg_size(1, &size);
+
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
+
+ body = lustre_msg_buf(request->rq_repmsg, 0);
+ memcpy(oa, &body->oa, sizeof(*oa));
+
+ EXIT;
+ out:
+ ptlrpc_free_req(request);
return 0;
-}
+}
+int osc_sendpage(struct obd_conn *conn, struct ptlrpc_request *req,
+ struct niobuf *dst, struct niobuf *src)
+{
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+
+ if (cl->cli_obd) {
+ /* local sendpage */
+ memcpy((char *)(unsigned long)dst->addr,
+ (char *)(unsigned long)src->addr, src->len);
+ } else {
+ struct ptlrpc_bulk_desc *bulk;
+ int rc;
+
+ bulk = ptlrpc_prep_bulk(&cl->cli_server);
+ if (bulk == NULL)
+ return -ENOMEM;
+
+ bulk->b_buf = (void *)(unsigned long)src->addr;
+ bulk->b_buflen = src->len;
+ bulk->b_xid = dst->xid;
+ rc = ptlrpc_send_bulk(bulk, OSC_BULK_PORTAL);
+ if (rc != 0) {
+ CERROR("send_bulk failed: %d\n", rc);
+ LBUG();
+ return rc;
+ }
+ wait_event_interruptible(bulk->b_waitq,
+ ptlrpc_check_bulk_sent(bulk));
+
+ if (bulk->b_flags == PTL_RPC_INTR) {
+ EXIT;
+ /* FIXME: hey hey, we leak here. */
+ return -EINTR;
+ }
+
+ OBD_FREE(bulk, sizeof(*bulk));
+ }
-static int osc_cleanup(struct obd_device * obddev)
+ return 0;
+}
+
+int osc_brw_read(struct obd_conn *conn, obd_count num_oa, struct obdo **oa,
+ obd_count *oa_bufs, struct page **buf, obd_size *count,
+ obd_off *offset, obd_flag *flags)
{
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ptlrpc_request *request;
+ struct ost_body *body;
+ struct obd_ioobj ioo;
+ struct niobuf src;
+ int pages, rc, i, j, size[3] = {sizeof(*body)};
+ void *ptr1, *ptr2;
+ struct ptlrpc_bulk_desc **bulk;
ENTRY;
- if ( !(obddev->obd_flags & OBD_SET_UP) ) {
- EXIT;
- return 0;
+ size[1] = num_oa * sizeof(ioo);
+ pages = 0;
+ for (i = 0; i < num_oa; i++)
+ pages += oa_bufs[i];
+ size[2] = pages * sizeof(src);
+
+ OBD_ALLOC(bulk, pages * sizeof(*bulk));
+ if (bulk == NULL)
+ RETURN(-ENOMEM);
+
+ request = ptlrpc_prep_req(cl, OST_BRW, 3, size, NULL);
+ if (!request)
+ GOTO(out, rc = -ENOMEM);
+
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ body->data = OBD_BRW_READ;
+
+ ptr1 = lustre_msg_buf(request->rq_reqmsg, 1);
+ ptr2 = lustre_msg_buf(request->rq_reqmsg, 2);
+ for (pages = 0, i = 0; i < num_oa; i++) {
+ ost_pack_ioo(&ptr1, oa[i], oa_bufs[i]);
+ for (j = 0; j < oa_bufs[i]; j++, pages++) {
+ bulk[pages] = ptlrpc_prep_bulk(&cl->cli_server);
+ if (bulk[pages] == NULL)
+ GOTO(out, rc = -ENOMEM);
+
+ spin_lock(&cl->cli_lock);
+ bulk[pages]->b_xid = cl->cli_xid++;
+ spin_unlock(&cl->cli_lock);
+
+ bulk[pages]->b_buf = kmap(buf[pages]);
+ bulk[pages]->b_buflen = PAGE_SIZE;
+ bulk[pages]->b_portal = OST_BULK_PORTAL;
+ ost_pack_niobuf(&ptr2, bulk[pages]->b_buf,
+ offset[pages], count[pages],
+ flags[pages], bulk[pages]->b_xid);
+
+ rc = ptlrpc_register_bulk(bulk[pages]);
+ if (rc)
+ GOTO(out, rc);
+ }
}
- MOD_DEC_USE_COUNT;
- EXIT;
+ request->rq_replen = lustre_msg_size(1, size);
+ rc = ptlrpc_queue_wait(cl, request);
+ GOTO(out, rc);
+
+ out:
+ /* FIXME: if we've called ptlrpc_wait_bulk but rc != 0, we need to
+ * abort those bulk listeners. */
+
+ for (pages = 0, i = 0; i < num_oa; i++) {
+ for (j = 0; j < oa_bufs[i]; j++, pages++) {
+ if (bulk[pages] == NULL)
+ continue;
+ kunmap(buf[pages]);
+ OBD_FREE(bulk[pages], sizeof(**bulk));
+ }
+ }
+
+ OBD_FREE(bulk, pages * sizeof(*bulk));
+ ptlrpc_free_req(request);
+ return rc;
+}
+
+int osc_brw_write(struct obd_conn *conn, obd_count num_oa, struct obdo **oa,
+ obd_count *oa_bufs, struct page **buf, obd_size *count,
+ obd_off *offset, obd_flag *flags)
+{
+ struct ptlrpc_client *cl = osc_con2cl(conn);
+ struct ptlrpc_request *request;
+ struct obd_ioobj ioo;
+ struct ost_body *body;
+ struct niobuf *src;
+ int pages, rc, i, j, size[3] = {sizeof(*body)};
+ void *ptr1, *ptr2;
+ ENTRY;
+
+ size[1] = num_oa * sizeof(ioo);
+ pages = 0;
+ for (i = 0; i < num_oa; i++)
+ pages += oa_bufs[i];
+ size[2] = pages * sizeof(*src);
+
+ OBD_ALLOC(src, size[2]);
+ if (!src)
+ RETURN(-ENOMEM);
+
+ request = ptlrpc_prep_req(cl, OST_BRW, 3, size, NULL);
+ if (!request)
+ RETURN(-ENOMEM);
+ body = lustre_msg_buf(request->rq_reqmsg, 0);
+ body->data = OBD_BRW_WRITE;
+
+ ptr1 = lustre_msg_buf(request->rq_reqmsg, 1);
+ ptr2 = lustre_msg_buf(request->rq_reqmsg, 2);
+ for (pages = 0, i = 0; i < num_oa; i++) {
+ ost_pack_ioo(&ptr1, oa[i], oa_bufs[i]);
+ for (j = 0; j < oa_bufs[i]; j++, pages++) {
+ ost_pack_niobuf(&ptr2, kmap(buf[pages]), offset[pages],
+ count[pages], flags[pages], 0);
+ }
+ }
+ memcpy(src, lustre_msg_buf(request->rq_reqmsg, 2), size[2]);
+
+ size[1] = pages * sizeof(struct niobuf);
+ request->rq_replen = lustre_msg_size(2, size);
+
+ rc = ptlrpc_queue_wait(cl, request);
+ if (rc)
+ GOTO(out, rc);
+
+ ptr2 = lustre_msg_buf(request->rq_repmsg, 1);
+ if (ptr2 == NULL)
+ GOTO(out, rc = -EINVAL);
+
+ if (request->rq_repmsg->buflens[1] != pages * sizeof(struct niobuf)) {
+ CERROR("buffer length wrong (%d vs. %d)\n",
+ request->rq_repmsg->buflens[1],
+ pages * sizeof(struct niobuf));
+ GOTO(out, rc = -EINVAL);
+ }
+
+ for (pages = 0, i = 0; i < num_oa; i++) {
+ for (j = 0; j < oa_bufs[i]; j++, pages++) {
+ struct niobuf *dst;
+ ost_unpack_niobuf(&ptr2, &dst);
+ osc_sendpage(conn, request, dst, &src[pages]);
+ }
+ }
+ OBD_FREE(src, size[2]);
+ out:
+ for (pages = 0, i = 0; i < num_oa; i++)
+ for (j = 0; j < oa_bufs[i]; j++, pages++)
+ kunmap(buf[n]);
+
+ ptlrpc_free_req(request);
return 0;
}
+int osc_brw(int rw, struct obd_conn *conn, obd_count num_oa,
+ struct obdo **oa, obd_count *oa_bufs, struct page **buf,
+ obd_size *count, obd_off *offset, obd_flag *flags)
+{
+ if (rw == OBD_BRW_READ)
+ return osc_brw_read(conn, num_oa, oa, oa_bufs, buf, count,
+ offset, flags);
+ else
+ return osc_brw_write(conn, num_oa, oa, oa_bufs, buf, count,
+ offset, flags);
+}
+
+/* mount the file system (secretly) */
+static int osc_setup(struct obd_device *obddev, obd_count len,
+ void *buf)
+
+{
+ struct osc_obd *osc = &obddev->u.osc;
+ struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf;
+ int rc;
+ int dev = data->ioc_dev;
+ ENTRY;
+
+ OBD_ALLOC(osc->osc_client, sizeof(*osc->osc_client));
+ if (osc->osc_client == NULL)
+ RETURN(-ENOMEM);
+
+ ptlrpc_init_client(dev, OST_REQUEST_PORTAL, OSC_REPLY_PORTAL,
+ osc->osc_client);
+ rc = ptlrpc_connect_client(dev, "ost", osc->osc_client);
+
+ if (rc == 0)
+ MOD_INC_USE_COUNT;
+ RETURN(rc);
+}
+
+static int osc_cleanup(struct obd_device * obddev)
+{
+ struct osc_obd *osc = &obddev->u.osc;
+
+ if (osc->osc_client != NULL)
+ OBD_FREE(osc->osc_client, sizeof(*osc->osc_client));
+
+ MOD_DEC_USE_COUNT;
+ return 0;
+}
-struct obd_ops osc_obd_ops = {
- o_setup: osc_setup,
- o_cleanup: osc_cleanup,
- o_getattr: osc_getattr,
- o_connect: osc_connect
+struct obd_ops osc_obd_ops = {
+ o_setup: osc_setup,
+ o_cleanup: osc_cleanup,
+ o_create: osc_create,
+ o_destroy: osc_destroy,
+ o_getattr: osc_getattr,
+ o_setattr: osc_setattr,
+ o_open: osc_open,
+ o_close: osc_close,
+ o_connect: osc_connect,
+ o_disconnect: osc_disconnect,
+ o_brw: osc_brw,
+ o_punch: osc_punch
};
static int __init osc_init(void)
{
obd_register_type(&osc_obd_ops, LUSTRE_OSC_NAME);
- return 0;
+ return 0;
}
static void __exit osc_exit(void)
{
- obd_unregister_type(LUSTRE_OSC_NAME);
+ obd_unregister_type(LUSTRE_OSC_NAME);
}
MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
MODULE_DESCRIPTION("Lustre Object Storage Client (OSC) v1.0");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL");
module_init(osc_init);
module_exit(osc_exit);
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff