#define EXPORT_SYMTAB
-#include <linux/config.h>
#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/errno.h>
-#include <linux/locks.h>
-#include <linux/unistd.h>
-
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <linux/module.h>
-
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <asm/uaccess.h>
-#include <asm/segment.h>
#include <linux/miscdevice.h>
#define DEBUG_SUBSYSTEM S_MDC
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
#include <linux/lustre_mds.h>
+#include <linux/lustre_lite.h>
#define REQUEST_MINOR 244
extern int mds_queue_req(struct ptlrpc_request *);
-
-int mdc_getattr(struct ptlrpc_client *cl, ino_t ino, int type, int valid,
- struct ptlrpc_request **req)
+int mdc_connect(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+ struct ll_fid *rootfid, __u64 *last_committed, __u64 *last_rcvd,
+ __u32 *last_xid, struct ptlrpc_request **request)
{
- int rc;
- struct ptlrpc_request *request;
-
+ struct ptlrpc_request *req;
+ struct mds_body *body;
+ int rc, size = sizeof(*body);
ENTRY;
- request = ptlrpc_prep_req(cl, MDS_GETATTR, 0, NULL, 0, NULL);
- if (!request) {
- CERROR("llight request: cannot pack\n");
+ req = ptlrpc_prep_req(cl, conn, MDS_CONNECT, 1, &size, NULL);
+ if (!req)
GOTO(out, rc = -ENOMEM);
+
+ body = lustre_msg_buf(req->rq_reqmsg, 0);
+ req->rq_replen = lustre_msg_size(1, &size);
+
+ mds_pack_req_body(req);
+ rc = ptlrpc_queue_wait(req);
+ rc = ptlrpc_check_status(req, rc);
+
+ if (!rc) {
+ mds_unpack_rep_body(req);
+ body = lustre_msg_buf(req->rq_repmsg, 0);
+ memcpy(rootfid, &body->fid1, sizeof(*rootfid));
+ *last_committed = req->rq_repmsg->last_committed;
+ *last_rcvd = req->rq_repmsg->last_rcvd;
+ *last_xid = body->last_xid;
+
+ CDEBUG(D_NET, "root ino=%ld, last_committed=%Lu, last_rcvd=%Lu,"
+ " last_xid=%d\n",
+ (unsigned long)rootfid->id,
+ (unsigned long long)*last_committed,
+ (unsigned long long)*last_rcvd,
+ body->last_xid);
}
- ll_ino2fid(&request->rq_req.mds->fid1, ino, 0, type);
+ EXIT;
+ out:
+ ptlrpc_free_req(req);
+ return rc;
+}
+
+
+int mdc_getattr(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+ ino_t ino, int type, unsigned long valid,
+ struct ptlrpc_request **request)
+{
+ struct ptlrpc_request *req;
+ struct mds_body *body;
+ int rc, size = sizeof(*body);
+ ENTRY;
+
+ req = ptlrpc_prep_req(cl, conn, MDS_GETATTR, 1, &size, NULL);
+ if (!req)
+ GOTO(out, rc = -ENOMEM);
+
+ body = lustre_msg_buf(req->rq_reqmsg, 0);
+ ll_ino2fid(&body->fid1, ino, 0, type);
+ body->valid = valid;
- request->rq_req.mds->valid = valid;
- request->rq_replen =
- sizeof(struct ptlrep_hdr) + sizeof(struct mds_rep);
+ req->rq_replen = lustre_msg_size(1, &size);
- rc = ptlrpc_queue_wait(cl, request);
- rc = ptlrpc_check_status(request, rc);
+ rc = ptlrpc_queue_wait(req);
+ rc = ptlrpc_check_status(req, rc);
- if (!rc)
- CDEBUG(D_NET, "mode: %o\n", request->rq_rep.mds->mode);
+ if (!rc) {
+ mds_unpack_rep_body(req);
+ body = lustre_msg_buf(req->rq_repmsg, 0);
+ CDEBUG(D_NET, "mode: %o\n", body->mode);
+ }
- GOTO(out, rc);
+ EXIT;
out:
- *req = request;
+ *request = req;
return rc;
}
-int mdc_open(struct ptlrpc_client *cl, ino_t ino, int type, int flags,
- __u64 *fh, struct ptlrpc_request **req)
+int mdc_open(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+ ino_t ino, int type, int flags, __u64 *fh,
+ struct ptlrpc_request **request)
{
- struct ptlrpc_request *request;
- int rc;
+ struct mds_body *body;
+ int rc, size = sizeof(*body);
+ struct ptlrpc_request *req;
- request = ptlrpc_prep_req(cl, MDS_OPEN, 0, NULL, 0, NULL);
- if (!request) {
- CERROR("llight request: cannot pack\n");
- rc = -ENOMEM;
- goto out;
- }
+ req = ptlrpc_prep_req(cl, conn, MDS_OPEN, 1, &size, NULL);
+ if (!req)
+ GOTO(out, rc = -ENOMEM);
- ll_ino2fid(&request->rq_req.mds->fid1, ino, 0, type);
- request->rq_req.mds->flags = HTON__u32(flags);
- request->rq_replen =
- sizeof(struct ptlrep_hdr) + sizeof(struct mds_rep);
+ req->rq_flags |= PTL_RPC_FL_RETAIN;
+ body = lustre_msg_buf(req->rq_reqmsg, 0);
+ ll_ino2fid(&body->fid1, ino, 0, type);
+ body->flags = HTON__u32(flags);
- rc = ptlrpc_queue_wait(cl, request);
- rc = ptlrpc_check_status(request, rc);
+ req->rq_replen = lustre_msg_size(1, &size);
- if (rc) {
- CERROR("llight request: error in handling %d\n", rc);
- goto out;
+ rc = ptlrpc_queue_wait(req);
+ rc = ptlrpc_check_status(req, rc);
+
+ if (!rc) {
+ mds_unpack_rep_body(req);
+ body = lustre_msg_buf(req->rq_repmsg, 0);
+ *fh = body->objid;
}
- *fh = request->rq_rep.mds->objid;
+ EXIT;
out:
- *req = request;
+ *request = req;
return rc;
}
-
-int mdc_close(struct ptlrpc_client *cl, ino_t ino, int type, __u64 fh,
- struct ptlrpc_request **req)
+int mdc_close(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+ ino_t ino, int type, __u64 fh, struct ptlrpc_request **request)
{
- struct ptlrpc_request *request;
- int rc;
+ struct mds_body *body;
+ int rc, size = sizeof(*body);
+ struct ptlrpc_request *req;
- request = ptlrpc_prep_req(cl, MDS_CLOSE, 0, NULL, 0, NULL);
- if (!request) {
- CERROR("llight request: cannot pack\n");
- rc = -ENOMEM;
- goto out;
- }
+ req = ptlrpc_prep_req(cl, conn, MDS_CLOSE, 1, &size, NULL);
+ if (!req)
+ GOTO(out, rc = -ENOMEM);
- ll_ino2fid(&request->rq_req.mds->fid1, ino, 0, type);
- request->rq_req.mds->objid = fh;
- request->rq_replen =
- sizeof(struct ptlrep_hdr) + sizeof(struct mds_rep);
+ body = lustre_msg_buf(req->rq_reqmsg, 0);
+ ll_ino2fid(&body->fid1, ino, 0, type);
+ body->objid = fh;
- rc = ptlrpc_queue_wait(cl, request);
- rc = ptlrpc_check_status(request, rc);
+ req->rq_replen = lustre_msg_size(0, NULL);
- if (rc) {
- CERROR("llight request: error in handling %d\n", rc);
- goto out;
- }
+ rc = ptlrpc_queue_wait(req);
+ rc = ptlrpc_check_status(req, rc);
+ EXIT;
out:
- *req = request;
+ *request = req;
return rc;
}
-int mdc_readpage(struct ptlrpc_client *cl, ino_t ino, int type, __u64 offset,
- char *addr, struct ptlrpc_request **req)
+int mdc_readpage(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+ ino_t ino, int type, __u64 offset, char *addr,
+ struct ptlrpc_request **request)
{
- struct ptlrpc_request *request = NULL;
+ struct ptlrpc_request *req = NULL;
struct ptlrpc_bulk_desc *bulk = NULL;
struct niobuf niobuf;
- int rc;
+ struct mds_body *body;
+ int rc, size[2] = {sizeof(*body), sizeof(struct niobuf)};
+ char *bufs[2] = {NULL, (char *)&niobuf};
niobuf.addr = (__u64) (long) addr;
- CDEBUG(D_INODE, "inode: %ld\n", ino);
+ CDEBUG(D_INODE, "inode: %ld\n", (long)ino);
- bulk = ptlrpc_prep_bulk(&cl->cli_server);
+ bulk = ptlrpc_prep_bulk(conn);
if (bulk == NULL) {
CERROR("%s: cannot init bulk desc\n", __FUNCTION__);
rc = -ENOMEM;
goto out;
}
- request = ptlrpc_prep_req(cl, MDS_READPAGE, 0, NULL,
- sizeof(struct niobuf), (char *)&niobuf);
- if (!request) {
- CERROR("%s: cannot pack\n", __FUNCTION__);
- rc = -ENOMEM;
- goto out;
- }
+ req = ptlrpc_prep_req(cl, conn, MDS_READPAGE, 2, size, bufs);
+ if (!req)
+ GOTO(out, rc = -ENOMEM);
bulk->b_buflen = PAGE_SIZE;
bulk->b_buf = (void *)(long)niobuf.addr;
bulk->b_portal = MDS_BULK_PORTAL;
- bulk->b_xid = request->rq_xid;
+ bulk->b_xid = req->rq_reqmsg->xid;
rc = ptlrpc_register_bulk(bulk);
if (rc) {
- CERROR("%s: couldn't setup bulk sink: error %d.\n",
- __FUNCTION__, rc);
- goto out;
+ CERROR("couldn't setup bulk sink: error %d.\n", rc);
+ GOTO(out, rc);
}
- request->rq_req.mds->fid1.id = ino;
- request->rq_req.mds->fid1.f_type = type;
- request->rq_req.mds->size = offset;
- request->rq_req.mds->tgtlen = sizeof(niobuf);
- request->rq_replen = sizeof(struct ptlrep_hdr) + sizeof(struct mds_rep);
+ body = lustre_msg_buf(req->rq_reqmsg, 0);
+ body->fid1.id = ino;
+ body->fid1.f_type = type;
+ body->size = offset;
- rc = ptlrpc_queue_wait(cl, request);
+ req->rq_replen = lustre_msg_size(1, size);
+
+ rc = ptlrpc_queue_wait(req);
if (rc) {
- CERROR("mdc request: error in handling %d\n", rc);
+ CERROR("error in handling %d\n", rc);
ptlrpc_abort_bulk(bulk);
- goto out;
+ GOTO(out, rc);
}
- CDEBUG(D_INODE, "mode: %o\n", request->rq_rep.mds->mode);
+ mds_unpack_rep_body(req);
+ EXIT;
out:
- *req = request;
- if (bulk != NULL)
- OBD_FREE(bulk, sizeof(*bulk));
+ *request = req;
+ ptlrpc_free_bulk(bulk);
return rc;
}
static int request_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- int err;
+ int err = 0;
struct ptlrpc_client cl;
+ struct ptlrpc_connection *conn;
struct ptlrpc_request *request;
ENTRY;
RETURN(-EINVAL);
}
- err = ptlrpc_connect_client(-1, "mds",
- MDS_REQUEST_PORTAL, MDC_REPLY_PORTAL,
- mds_pack_req, mds_unpack_rep, &cl);
- if (err) {
+ ptlrpc_init_client(NULL, NULL,
+ MDS_REQUEST_PORTAL, MDC_REPLY_PORTAL, &cl);
+ conn = ptlrpc_uuid_to_connection("mds");
+ if (!conn) {
CERROR("cannot create client\n");
RETURN(-EINVAL);
}
switch (cmd) {
case IOC_REQUEST_GETATTR: {
CERROR("-- getting attr for ino %lu\n", arg);
- err = mdc_getattr(&cl, arg, S_IFDIR, ~0, &request);
+ err = mdc_getattr(&cl, conn, arg, S_IFDIR, ~0, &request);
CERROR("-- done err %d\n", err);
GOTO(out, err);
OBD_ALLOC(buf, PAGE_SIZE);
if (!buf) {
err = -ENOMEM;
- break;
+ GOTO(out, err);
}
CERROR("-- readpage 0 for ino %lu\n", arg);
- err = mdc_readpage(&cl, arg, S_IFDIR, 0, buf, &request);
+ err = mdc_readpage(&cl, conn, arg, S_IFDIR, 0, buf, &request);
CERROR("-- done err %d\n", err);
OBD_FREE(buf, PAGE_SIZE);
iattr.ia_atime = 0;
iattr.ia_valid = ATTR_MODE | ATTR_ATIME;
- err = mdc_setattr(&cl, &inode, &iattr, &request);
+ err = mdc_setattr(&cl, conn, &inode, &iattr, &request);
CERROR("-- done err %d\n", err);
GOTO(out, err);
iattr.ia_atime = 0;
iattr.ia_valid = ATTR_MODE | ATTR_ATIME;
- err = mdc_create(&cl, &inode,
+ err = mdc_create(&cl, conn, &inode,
"foofile", strlen("foofile"),
NULL, 0, 0100707, 47114711,
11, 47, 0, &request);
case IOC_REQUEST_OPEN: {
__u64 fh, ino;
copy_from_user(&ino, (__u64 *)arg, sizeof(ino));
- CERROR("-- opening ino %llu\n", ino);
- err = mdc_open(&cl, ino, S_IFDIR, O_RDONLY, &fh, &request);
+ CERROR("-- opening ino %llu\n", (unsigned long long)ino);
+ err = mdc_open(&cl, conn, ino, S_IFDIR, O_RDONLY, &fh,
+ &request);
copy_to_user((__u64 *)arg, &fh, sizeof(fh));
- CERROR("-- done err %d (fh=%Lu)\n", err, fh);
+ CERROR("-- done err %d (fh=%Lu)\n", err,
+ (unsigned long long)fh);
GOTO(out, err);
}
case IOC_REQUEST_CLOSE: {
CERROR("-- closing ino 2, filehandle %lu\n", arg);
- err = mdc_close(&cl, 2, S_IFDIR, arg, &request);
+ err = mdc_close(&cl, conn, 2, S_IFDIR, arg, &request);
CERROR("-- done err %d\n", err);
GOTO(out, err);
}
default:
- RETURN(-EINVAL);
+ GOTO(out, err = -EINVAL);
}
out:
ptlrpc_free_req(request);
+ ptlrpc_put_connection(conn);
+ ptlrpc_cleanup_client(&cl);
RETURN(err);
}
MODULE_DESCRIPTION("Lustre MDS Request Tester v1.0");
MODULE_LICENSE("GPL");
+EXPORT_SYMBOL(mdc_connect);
+EXPORT_SYMBOL(mdc_getattr);
EXPORT_SYMBOL(mdc_create);
EXPORT_SYMBOL(mdc_unlink);
EXPORT_SYMBOL(mdc_rename);
EXPORT_SYMBOL(mdc_link);
-EXPORT_SYMBOL(mdc_getattr);
EXPORT_SYMBOL(mdc_readpage);
EXPORT_SYMBOL(mdc_setattr);
EXPORT_SYMBOL(mdc_close);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff