From d29bd6bd4d5322ce1f11346cf14702124705b0a4 Mon Sep 17 00:00:00 2001 From: ericm Date: Fri, 7 Nov 2003 15:51:22 +0000 Subject: [PATCH] merge b_devel to b_eq: 20031107 kernel passed sanity, but liblustre broken since lconf changes. need fix by robert. --- lnet/utils/wirecheck.c | 94 ++- lustre/kernel_patches/patches/dsp.patch | 54 +- lustre/kernel_patches/series/vanilla-2.4.20 | 1 + lustre/ldlm/ldlm_lib.c | 181 ++++- lustre/mgmt/mgmt_svc.c | 20 +- lustre/portals/utils/wirecheck.c | 94 ++- lustre/ptlrpc/ptlrpc_lib.c | 4 +- lustre/utils/wirecheck.c | 1117 ++++++++++++++------------- 8 files changed, 969 insertions(+), 596 deletions(-) diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c index 6a4377b..77ad126 100644 --- a/lnet/utils/wirecheck.c +++ b/lnet/utils/wirecheck.c @@ -2,10 +2,14 @@ * vim:expandtab:shiftwidth=8:tabstop=8: */ #include +#include +#include #include #include #include +extern size_t strnlen(const char *, size_t); + #define BLANK_LINE() \ do { \ printf ("\n"); \ @@ -77,47 +81,109 @@ check_ptl_hdr (void) CHECK_MEMBER (ptl_hdr_t, dest_pid); CHECK_MEMBER (ptl_hdr_t, src_pid); CHECK_MEMBER (ptl_hdr_t, type); - + CHECK_MEMBER (ptl_hdr_t, payload_length); + CHECK_MEMBER (ptl_hdr_t, msg); + BLANK_LINE (); COMMENT ("Ack"); - CHECK_MEMBER (ptl_hdr_t, msg.ack.mlength); CHECK_MEMBER (ptl_hdr_t, msg.ack.dst_wmd); CHECK_MEMBER (ptl_hdr_t, msg.ack.match_bits); - CHECK_MEMBER (ptl_hdr_t, msg.ack.length); + CHECK_MEMBER (ptl_hdr_t, msg.ack.mlength); BLANK_LINE (); COMMENT ("Put"); - CHECK_MEMBER (ptl_hdr_t, msg.put.ptl_index); CHECK_MEMBER (ptl_hdr_t, msg.put.ack_wmd); CHECK_MEMBER (ptl_hdr_t, msg.put.match_bits); - CHECK_MEMBER (ptl_hdr_t, msg.put.length); - CHECK_MEMBER (ptl_hdr_t, msg.put.offset); CHECK_MEMBER (ptl_hdr_t, msg.put.hdr_data); + CHECK_MEMBER (ptl_hdr_t, msg.put.ptl_index); + CHECK_MEMBER (ptl_hdr_t, msg.put.offset); BLANK_LINE (); COMMENT ("Get"); - CHECK_MEMBER (ptl_hdr_t, msg.get.ptl_index); CHECK_MEMBER (ptl_hdr_t, msg.get.return_wmd); CHECK_MEMBER (ptl_hdr_t, msg.get.match_bits); - CHECK_MEMBER (ptl_hdr_t, msg.get.length); + CHECK_MEMBER (ptl_hdr_t, msg.get.ptl_index); CHECK_MEMBER (ptl_hdr_t, msg.get.src_offset); - CHECK_MEMBER (ptl_hdr_t, msg.get.return_offset); CHECK_MEMBER (ptl_hdr_t, msg.get.sink_length); BLANK_LINE (); COMMENT ("Reply"); CHECK_MEMBER (ptl_hdr_t, msg.reply.dst_wmd); - CHECK_MEMBER (ptl_hdr_t, msg.reply.dst_offset); - CHECK_MEMBER (ptl_hdr_t, msg.reply.length); + + BLANK_LINE (); + COMMENT ("Hello"); + CHECK_MEMBER (ptl_hdr_t, msg.hello.incarnation); + CHECK_MEMBER (ptl_hdr_t, msg.hello.type); +} + +void +system_string (char *cmdline, char *str, int len) +{ + int fds[2]; + int rc; + pid_t pid; + + rc = pipe (fds); + if (rc != 0) + abort (); + + pid = fork (); + if (pid == 0) { + /* child */ + int fd = fileno(stdout); + + rc = dup2(fds[1], fd); + if (rc != fd) + abort(); + + exit(system(cmdline)); + /* notreached */ + } else if ((int)pid < 0) { + abort(); + } else { + FILE *f = fdopen (fds[0], "r"); + + if (f == NULL) + abort(); + + close(fds[1]); + + if (fgets(str, len, f) == NULL) + abort(); + + if (waitpid(pid, &rc, 0) != pid) + abort(); + + if (!WIFEXITED(rc) || + WEXITSTATUS(rc) != 0) + abort(); + + if (strnlen(str, len) == len) + str[len - 1] = 0; + + if (str[strlen(str) - 1] == '\n') + str[strlen(str) - 1] = 0; + + fclose(f); + } } int main (int argc, char **argv) { + char unameinfo[80]; + char gccinfo[80]; + + system_string("uname -a", unameinfo, sizeof(unameinfo)); + system_string("gcc -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo)); + printf ("void lib_assert_wire_constants (void)\n" - "{\n"); - - COMMENT ("Wire protocol assertions generated by 'wirecheck'"); + "{\n" + " /* Wire protocol assertions generated by 'wirecheck'\n" + " * running on %s\n" + " * with %s */\n" + "\n", unameinfo, gccinfo); + BLANK_LINE (); COMMENT ("Constants..."); diff --git a/lustre/kernel_patches/patches/dsp.patch b/lustre/kernel_patches/patches/dsp.patch index f2e5b93..d072af9 100644 --- a/lustre/kernel_patches/patches/dsp.patch +++ b/lustre/kernel_patches/patches/dsp.patch @@ -6,9 +6,11 @@ kernel/bootimg_pic.c | 6 ++++-- 6 files changed, 36 insertions(+), 12 deletions(-) ---- linux-rh-2.4.20-8/kernel/bootimg.c~dsp 2003-05-07 19:30:47.000000000 +0800 -+++ linux-rh-2.4.20-8-root/kernel/bootimg.c 2003-05-07 19:31:12.000000000 +0800 -@@ -238,9 +238,20 @@ int boot_image() +Index: linux-2.4.20-rh/kernel/bootimg.c +=================================================================== +--- linux-2.4.20-rh.orig/kernel/bootimg.c 2003-10-29 23:56:02.000000000 +0800 ++++ linux-2.4.20-rh/kernel/bootimg.c 2003-10-29 23:56:17.000000000 +0800 +@@ -238,9 +238,20 @@ int error = -ENOMEM; if (bootimg_checksum(__va(bootimg_dsc.page_dir),bootimg_dsc.pages) @@ -30,9 +32,11 @@ code_page = get_identity_mapped_page(); if (!code_page) goto out3; code = (relocate_and_jump_t) virt_to_phys((void *) code_page); ---- linux-rh-2.4.20-8/kernel/bootimg_pic.c~dsp 2003-05-07 19:30:47.000000000 +0800 -+++ linux-rh-2.4.20-8-root/kernel/bootimg_pic.c 2003-05-07 19:31:12.000000000 +0800 -@@ -69,7 +69,8 @@ void __bootimg relocate_and_jump(void) +Index: linux-2.4.20-rh/kernel/bootimg_pic.c +=================================================================== +--- linux-2.4.20-rh.orig/kernel/bootimg_pic.c 2003-10-29 23:56:02.000000000 +0800 ++++ linux-2.4.20-rh/kernel/bootimg_pic.c 2003-10-29 23:56:17.000000000 +0800 +@@ -69,7 +69,8 @@ for (j = i+1; j < dsc.pages; j++) { table = dsc.page_dir+FROM_TABLE(j); if (((unsigned long) *table) == to) { @@ -42,7 +46,7 @@ break; } if ((*table)[PAGE_NR(j)] == to) { -@@ -79,7 +80,8 @@ void __bootimg relocate_and_jump(void) +@@ -79,7 +80,8 @@ } table = dsc.page_dir+TO_TABLE(j); if (((unsigned long) *table) == to) { @@ -52,19 +56,25 @@ break; } } ---- linux-rh-2.4.20-8/include/asm-i386/apic.h~dsp 2003-05-07 17:00:16.000000000 +0800 -+++ linux-rh-2.4.20-8-root/include/asm-i386/apic.h 2003-05-07 19:31:12.000000000 +0800 -@@ -86,6 +86,7 @@ extern struct pm_dev *apic_pm_register(p +Index: linux-2.4.20-rh/include/asm-i386/apic.h +=================================================================== +--- linux-2.4.20-rh.orig/include/asm-i386/apic.h 2003-10-29 23:58:49.000000000 +0800 ++++ linux-2.4.20-rh/include/asm-i386/apic.h 2003-10-29 23:59:40.000000000 +0800 +@@ -86,6 +86,9 @@ extern void apic_pm_unregister(struct pm_dev*); extern int check_nmi_watchdog (void); +extern void disable_apic_nmi_watchdog(void); ++ ++ extern unsigned int nmi_watchdog; #define NMI_NONE 0 ---- linux-rh-2.4.20-8/include/linux/crash.h~dsp 2003-05-07 19:30:47.000000000 +0800 -+++ linux-rh-2.4.20-8-root/include/linux/crash.h 2003-05-07 19:31:12.000000000 +0800 -@@ -71,7 +71,7 @@ extern void stop_this_cpu(void *); +Index: linux-2.4.20-rh/include/linux/crash.h +=================================================================== +--- linux-2.4.20-rh.orig/include/linux/crash.h 2003-10-29 23:56:02.000000000 +0800 ++++ linux-2.4.20-rh/include/linux/crash.h 2003-10-29 23:56:17.000000000 +0800 +@@ -71,7 +71,7 @@ #define CRASH_ZALLOC_PAGES 16*5*2 /* 2 to handle crash in crash */ #define CRASH_LOW_WATER_PAGES 100 @@ -73,8 +83,10 @@ #define CRASH_MARK_RESERVED(addr) (set_bit(PG_reserved,&mem_map[MAP_NR(addr)].flags)) #define CRASH_CLEAR_RESERVED(addr) (clear_bit(PG_reserved,&mem_map[MAP_NR(addr)].flags)) ---- linux-rh-2.4.20-8/arch/i386/kernel/crash.c~dsp 2003-05-07 19:30:47.000000000 +0800 -+++ linux-rh-2.4.20-8-root/arch/i386/kernel/crash.c 2003-05-07 19:31:39.000000000 +0800 +Index: linux-2.4.20-rh/arch/i386/kernel/crash.c +=================================================================== +--- linux-2.4.20-rh.orig/arch/i386/kernel/crash.c 2003-10-29 23:56:02.000000000 +0800 ++++ linux-2.4.20-rh/arch/i386/kernel/crash.c 2003-10-29 23:56:17.000000000 +0800 @@ -9,6 +9,8 @@ #include #include @@ -84,7 +96,7 @@ inline void crash_save_regs(void) { static unsigned long regs[8]; -@@ -30,15 +32,23 @@ inline void crash_save_regs(void) { +@@ -30,15 +32,23 @@ */ void crash_save_current_state(struct task_struct *tp) { @@ -115,9 +127,11 @@ save_core(); ---- linux-rh-2.4.20-8/arch/i386/kernel/nmi.c~dsp 2003-05-07 19:30:47.000000000 +0800 -+++ linux-rh-2.4.20-8-root/arch/i386/kernel/nmi.c 2003-05-07 19:31:12.000000000 +0800 -@@ -138,7 +138,7 @@ __setup("nmi_watchdog=", setup_nmi_watch +Index: linux-2.4.20-rh/arch/i386/kernel/nmi.c +=================================================================== +--- linux-2.4.20-rh.orig/arch/i386/kernel/nmi.c 2003-10-29 23:56:02.000000000 +0800 ++++ linux-2.4.20-rh/arch/i386/kernel/nmi.c 2003-10-29 23:56:17.000000000 +0800 +@@ -138,7 +138,7 @@ struct pm_dev *nmi_pmdev; @@ -126,5 +140,3 @@ { switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: - -_ diff --git a/lustre/kernel_patches/series/vanilla-2.4.20 b/lustre/kernel_patches/series/vanilla-2.4.20 index 728b29c..2a8f20a 100644 --- a/lustre/kernel_patches/series/vanilla-2.4.20 +++ b/lustre/kernel_patches/series/vanilla-2.4.20 @@ -45,3 +45,4 @@ ext3-raw-lookup.patch ext3-ea-in-inode-2.4.20.patch listman-2.4.20.patch ext3-trusted_ea-2.4.20.patch +kernel_text_address-2.4.20-vanilla.patch diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 8fe5675..294338d 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -29,11 +29,191 @@ #else # include #endif +#include #include +#include #include #include #include +int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf) +{ + struct ptlrpc_connection *conn; + struct lustre_cfg* lcfg = buf; + struct client_obd *cli = &obddev->u.cli; + struct obd_import *imp; + struct obd_uuid server_uuid; + int rq_portal, rp_portal, connect_op; + char *name = obddev->obd_type->typ_name; + char *mgmt_name = NULL; + int rc = 0; + struct obd_device *mgmt_obd; + mgmtcli_register_for_events_t register_f; + ENTRY; + + /* In a more perfect world, we would hang a ptlrpc_client off of + * obd_type and just use the values from there. */ + if (!strcmp(name, LUSTRE_OSC_NAME)) { + rq_portal = OST_REQUEST_PORTAL; + rp_portal = OSC_REPLY_PORTAL; + connect_op = OST_CONNECT; + } else if (!strcmp(name, LUSTRE_MDC_NAME)) { + rq_portal = MDS_REQUEST_PORTAL; + rp_portal = MDC_REPLY_PORTAL; + connect_op = MDS_CONNECT; + } else if (!strcmp(name, LUSTRE_MGMTCLI_NAME)) { + rq_portal = MGMT_REQUEST_PORTAL; + rp_portal = MGMT_REPLY_PORTAL; + connect_op = MGMT_CONNECT; + } else { + CERROR("unknown client OBD type \"%s\", can't setup\n", + name); + RETURN(-EINVAL); + } + + if (lcfg->lcfg_inllen1 < 1) { + CERROR("requires a TARGET UUID\n"); + RETURN(-EINVAL); + } + + if (lcfg->lcfg_inllen1 > 37) { + CERROR("client UUID must be less than 38 characters\n"); + RETURN(-EINVAL); + } + + if (lcfg->lcfg_inllen2 < 1) { + CERROR("setup requires a SERVER UUID\n"); + RETURN(-EINVAL); + } + + if (lcfg->lcfg_inllen2 > 37) { + CERROR("target UUID must be less than 38 characters\n"); + RETURN(-EINVAL); + } + + sema_init(&cli->cl_sem, 1); + cli->cl_conn_count = 0; + memcpy(server_uuid.uuid, lcfg->lcfg_inlbuf2, MIN(lcfg->lcfg_inllen2, + sizeof(server_uuid))); + + init_MUTEX(&cli->cl_dirty_sem); + cli->cl_dirty = 0; + cli->cl_dirty_granted = 0; + cli->cl_dirty_max = 64*1024*1024; /* some default */ + cli->cl_ost_can_grant = 1; + INIT_LIST_HEAD(&cli->cl_cache_waiters); + INIT_LIST_HEAD(&cli->cl_loi_ready_list); + spin_lock_init(&cli->cl_loi_list_lock); + cli->cl_brw_in_flight = 0; + spin_lock_init(&cli->cl_rpc_concurrency_oh.oh_lock); + spin_lock_init(&cli->cl_pages_per_rpc_oh.oh_lock); + cli->cl_max_pages_per_rpc = PTL_MD_MAX_IOV; + cli->cl_max_rpcs_in_flight = 8; + + ldlm_get_ref(); + if (rc) { + CERROR("ldlm_get_ref failed: %d\n", rc); + GOTO(err, rc); + } + + conn = ptlrpc_uuid_to_connection(&server_uuid); + if (conn == NULL) + GOTO(err_ldlm, rc = -ENOENT); + + ptlrpc_init_client(rq_portal, rp_portal, name, + &obddev->obd_ldlm_client); + + imp = class_new_import(); + if (imp == NULL) { + ptlrpc_put_connection(conn); + GOTO(err_ldlm, rc = -ENOENT); + } + imp->imp_connection = conn; + imp->imp_client = &obddev->obd_ldlm_client; + imp->imp_obd = obddev; + imp->imp_connect_op = connect_op; + imp->imp_generation = 0; + INIT_LIST_HEAD(&imp->imp_pinger_chain); + memcpy(imp->imp_target_uuid.uuid, lcfg->lcfg_inlbuf1, + lcfg->lcfg_inllen1); + class_import_put(imp); + + cli->cl_import = imp; + cli->cl_max_mds_easize = sizeof(struct lov_mds_md); + cli->cl_max_mds_cookiesize = sizeof(struct llog_cookie); + cli->cl_sandev = to_kdev_t(0); + + if (lcfg->lcfg_inllen3 != 0) { + if (!strcmp(lcfg->lcfg_inlbuf3, "inactive")) { + CDEBUG(D_HA, "marking %s %s->%s as inactive\n", + name, obddev->obd_name, + imp->imp_target_uuid.uuid); + imp->imp_invalid = 1; + + if (lcfg->lcfg_inllen4 != 0) + mgmt_name = lcfg->lcfg_inlbuf4; + } else { + mgmt_name = lcfg->lcfg_inlbuf3; + } + } + + if (mgmt_name != NULL) { + /* Register with management client if we need to. */ + CDEBUG(D_HA, "%s registering with %s for events about %s\n", + obddev->obd_name, mgmt_name, server_uuid.uuid); + + mgmt_obd = class_name2obd(mgmt_name); + if (!mgmt_obd) { + CERROR("can't find mgmtcli %s to register\n", + mgmt_name); + GOTO(err_import, rc = -ENOSYS); + } + + register_f = inter_module_get("mgmtcli_register_for_events"); + if (!register_f) { + CERROR("can't i_m_g mgmtcli_register_for_events\n"); + GOTO(err_import, rc = -ENOSYS); + } + + rc = register_f(mgmt_obd, obddev, &imp->imp_target_uuid); + inter_module_put("mgmtcli_register_for_events"); + + if (!rc) + cli->cl_mgmtcli_obd = mgmt_obd; + } + + RETURN(rc); + +err_import: + class_destroy_import(imp); +err_ldlm: + ldlm_put_ref(); +err: + RETURN(rc); + +} + +int client_obd_cleanup(struct obd_device *obddev, int flags) +{ + struct client_obd *cli = &obddev->u.cli; + + if (!cli->cl_import) + RETURN(-EINVAL); + if (cli->cl_mgmtcli_obd) { + mgmtcli_deregister_for_events_t dereg_f; + + dereg_f = inter_module_get("mgmtcli_deregister_for_events"); + dereg_f(cli->cl_mgmtcli_obd, obddev); + inter_module_put("mgmtcli_deregister_for_events"); + } + class_destroy_import(cli->cl_import); + cli->cl_import = NULL; + + ldlm_put_ref(); + + RETURN(0); +} + int client_connect_import(struct lustre_handle *dlm_handle, struct obd_device *obd, struct obd_uuid *cluuid) @@ -747,7 +927,6 @@ int target_queue_final_reply(struct ptlrpc_request *req, int rc) obd->obd_name); obd->obd_recovering = 0; - obd_postsetup(obd); /* when recovering finished, cleanup orphans for mds */ if (OBT(obd) && OBP(obd, postrecov)) { rc2 = OBP(obd, postrecov)(obd); diff --git a/lustre/mgmt/mgmt_svc.c b/lustre/mgmt/mgmt_svc.c index 5a35760..8743e72 100644 --- a/lustre/mgmt/mgmt_svc.c +++ b/lustre/mgmt/mgmt_svc.c @@ -91,25 +91,23 @@ static int mgmt_setup(struct obd_device *obd, obd_count len, void *buf) mgmt_service = ptlrpc_init_svc(MGMT_NBUFS, MGMT_BUFSIZE, MGMT_MAXREQSIZE, MGMT_REQUEST_PORTAL, MGMT_REPLY_PORTAL, - mgmt_handler, "mgmt", obd); + mgmt_handler, "mgmt", + obd->obd_proc_entry); if (!mgmt_service) { CERROR("Failed to start mgmt service\n"); RETURN(-ENOMEM); } - for (i = 0; i < MGMT_NUM_THREADS; i++) { - char name[32]; - sprintf(name, "mgmt_%02d", i); - rc = ptlrpc_start_thread(obd, mgmt_service, name); - if (rc) { - CERROR("failed to start mgmt thread %d: %d\n", i, rc); - LBUG(); - } - } - + rc = ptlrpc_start_n_threads(obd, mgmt_service, MGMT_NUM_THREADS,"mgmt"); + if (rc) + GOTO(err, rc); + mgmt_initialized = 1; RETURN(0); +err: + ptlrpc_unregister_service(mgmt_service); + RETURN(rc): } static int mgmt_cleanup(struct obd_device *obd, int flags) diff --git a/lustre/portals/utils/wirecheck.c b/lustre/portals/utils/wirecheck.c index 6a4377b..77ad126 100644 --- a/lustre/portals/utils/wirecheck.c +++ b/lustre/portals/utils/wirecheck.c @@ -2,10 +2,14 @@ * vim:expandtab:shiftwidth=8:tabstop=8: */ #include +#include +#include #include #include #include +extern size_t strnlen(const char *, size_t); + #define BLANK_LINE() \ do { \ printf ("\n"); \ @@ -77,47 +81,109 @@ check_ptl_hdr (void) CHECK_MEMBER (ptl_hdr_t, dest_pid); CHECK_MEMBER (ptl_hdr_t, src_pid); CHECK_MEMBER (ptl_hdr_t, type); - + CHECK_MEMBER (ptl_hdr_t, payload_length); + CHECK_MEMBER (ptl_hdr_t, msg); + BLANK_LINE (); COMMENT ("Ack"); - CHECK_MEMBER (ptl_hdr_t, msg.ack.mlength); CHECK_MEMBER (ptl_hdr_t, msg.ack.dst_wmd); CHECK_MEMBER (ptl_hdr_t, msg.ack.match_bits); - CHECK_MEMBER (ptl_hdr_t, msg.ack.length); + CHECK_MEMBER (ptl_hdr_t, msg.ack.mlength); BLANK_LINE (); COMMENT ("Put"); - CHECK_MEMBER (ptl_hdr_t, msg.put.ptl_index); CHECK_MEMBER (ptl_hdr_t, msg.put.ack_wmd); CHECK_MEMBER (ptl_hdr_t, msg.put.match_bits); - CHECK_MEMBER (ptl_hdr_t, msg.put.length); - CHECK_MEMBER (ptl_hdr_t, msg.put.offset); CHECK_MEMBER (ptl_hdr_t, msg.put.hdr_data); + CHECK_MEMBER (ptl_hdr_t, msg.put.ptl_index); + CHECK_MEMBER (ptl_hdr_t, msg.put.offset); BLANK_LINE (); COMMENT ("Get"); - CHECK_MEMBER (ptl_hdr_t, msg.get.ptl_index); CHECK_MEMBER (ptl_hdr_t, msg.get.return_wmd); CHECK_MEMBER (ptl_hdr_t, msg.get.match_bits); - CHECK_MEMBER (ptl_hdr_t, msg.get.length); + CHECK_MEMBER (ptl_hdr_t, msg.get.ptl_index); CHECK_MEMBER (ptl_hdr_t, msg.get.src_offset); - CHECK_MEMBER (ptl_hdr_t, msg.get.return_offset); CHECK_MEMBER (ptl_hdr_t, msg.get.sink_length); BLANK_LINE (); COMMENT ("Reply"); CHECK_MEMBER (ptl_hdr_t, msg.reply.dst_wmd); - CHECK_MEMBER (ptl_hdr_t, msg.reply.dst_offset); - CHECK_MEMBER (ptl_hdr_t, msg.reply.length); + + BLANK_LINE (); + COMMENT ("Hello"); + CHECK_MEMBER (ptl_hdr_t, msg.hello.incarnation); + CHECK_MEMBER (ptl_hdr_t, msg.hello.type); +} + +void +system_string (char *cmdline, char *str, int len) +{ + int fds[2]; + int rc; + pid_t pid; + + rc = pipe (fds); + if (rc != 0) + abort (); + + pid = fork (); + if (pid == 0) { + /* child */ + int fd = fileno(stdout); + + rc = dup2(fds[1], fd); + if (rc != fd) + abort(); + + exit(system(cmdline)); + /* notreached */ + } else if ((int)pid < 0) { + abort(); + } else { + FILE *f = fdopen (fds[0], "r"); + + if (f == NULL) + abort(); + + close(fds[1]); + + if (fgets(str, len, f) == NULL) + abort(); + + if (waitpid(pid, &rc, 0) != pid) + abort(); + + if (!WIFEXITED(rc) || + WEXITSTATUS(rc) != 0) + abort(); + + if (strnlen(str, len) == len) + str[len - 1] = 0; + + if (str[strlen(str) - 1] == '\n') + str[strlen(str) - 1] = 0; + + fclose(f); + } } int main (int argc, char **argv) { + char unameinfo[80]; + char gccinfo[80]; + + system_string("uname -a", unameinfo, sizeof(unameinfo)); + system_string("gcc -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo)); + printf ("void lib_assert_wire_constants (void)\n" - "{\n"); - - COMMENT ("Wire protocol assertions generated by 'wirecheck'"); + "{\n" + " /* Wire protocol assertions generated by 'wirecheck'\n" + " * running on %s\n" + " * with %s */\n" + "\n", unameinfo, gccinfo); + BLANK_LINE (); COMMENT ("Constants..."); diff --git a/lustre/ptlrpc/ptlrpc_lib.c b/lustre/ptlrpc/ptlrpc_lib.c index 68d7be6..7883c9f 100644 --- a/lustre/ptlrpc/ptlrpc_lib.c +++ b/lustre/ptlrpc/ptlrpc_lib.c @@ -135,9 +135,7 @@ int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf) cli->cl_max_mds_easize = sizeof(struct lov_mds_md); cli->cl_max_mds_cookiesize = sizeof(struct llog_cookie); cli->cl_sandev = to_kdev_t(0); - - obddev->obd_logops = &llogd_client_ops; - + if (lcfg->lcfg_inllen3 == 0) RETURN(0); diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index b4e45fe..2e5d51e 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -1,649 +1,702 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + */ #include #include #include #include -#define BLANK_LINE() \ -do { \ - printf ("\n"); \ -} while (0) +#define BLANK_LINE() \ +do { \ + printf("\n"); \ +} while(0) -#define COMMENT(c) \ -do { \ - printf (" /* "c" */\n"); \ -} while (0) +#define COMMENT(c) \ +do { \ + printf(" /* "c" */\n"); \ +} while(0) #define STRINGIFY(a) #a -#define CHECK_DEFINE(a) \ -do { \ - printf(" LASSERT ("#a" == "STRINGIFY(a)");\n"); \ -} while (0) +#define CHECK_DEFINE(a) \ +do { \ + printf(" LASSERT("#a" == "STRINGIFY(a)");\n"); \ +} while(0) -#define CHECK_VALUE(a) \ -do { \ - printf(" LASSERT ("#a" == %d);\n", a); \ -} while (0) +#define CHECK_VALUE(a) \ +do { \ + printf(" LASSERT("#a" == %d);\n", a); \ +} while(0) -#define CHECK_MEMBER_OFFSET(s,m) \ -do { \ - CHECK_VALUE(offsetof (struct s, m)); \ -} while (0) +#define CHECK_MEMBER_OFFSET(s,m) \ +do { \ + CHECK_VALUE(offsetof(struct s, m)); \ +} while(0) -#define CHECK_MEMBER_SIZEOF(s,m) \ -do { \ - CHECK_VALUE((int)sizeof(((struct s *)0)->m)); \ -} while (0) +#define CHECK_MEMBER_SIZEOF(s,m) \ +do { \ + CHECK_VALUE((int)sizeof(((struct s *)0)->m)); \ +} while(0) -#define CHECK_MEMBER(s,m) \ -do { \ - CHECK_MEMBER_OFFSET(s, m); \ - CHECK_MEMBER_SIZEOF(s, m); \ -} while (0) +#define CHECK_MEMBER(s,m) \ +do { \ + CHECK_MEMBER_OFFSET(s, m); \ + CHECK_MEMBER_SIZEOF(s, m); \ +} while(0) -#define CHECK_STRUCT(s) \ -do { \ - COMMENT("Checks for struct "#s); \ - CHECK_VALUE((int)sizeof(struct s)); \ -} while (0) +#define CHECK_STRUCT(s) \ +do { \ + COMMENT("Checks for struct "#s); \ + CHECK_VALUE((int)sizeof(struct s)); \ +} while(0) -void check1 (void) +void check1(void) { #define VALUE 1234567 - CHECK_VALUE (VALUE); - CHECK_DEFINE (VALUE); -} - -void -check_lustre_handle (void) -{ - BLANK_LINE (); - CHECK_STRUCT (lustre_handle); - CHECK_MEMBER (lustre_handle, cookie); -} - -void -check_lustre_msg (void) -{ - BLANK_LINE (); - CHECK_STRUCT (lustre_msg); - CHECK_MEMBER (lustre_msg, handle); - CHECK_MEMBER (lustre_msg, magic); - CHECK_MEMBER (lustre_msg, type); - CHECK_MEMBER (lustre_msg, version); - CHECK_MEMBER (lustre_msg, opc); - CHECK_MEMBER (lustre_msg, last_xid); - CHECK_MEMBER (lustre_msg, last_committed); - CHECK_MEMBER (lustre_msg, transno); - CHECK_MEMBER (lustre_msg, status); - CHECK_MEMBER (lustre_msg, flags); - CHECK_MEMBER (lustre_msg, bufcount); - CHECK_MEMBER (lustre_msg, buflens[7]); -} - -void -check_obdo (void) -{ - BLANK_LINE (); - CHECK_STRUCT (obdo); - CHECK_MEMBER (obdo, o_id); - CHECK_MEMBER (obdo, o_gr); - CHECK_MEMBER (obdo, o_atime); - CHECK_MEMBER (obdo, o_mtime); - CHECK_MEMBER (obdo, o_ctime); - CHECK_MEMBER (obdo, o_size); - CHECK_MEMBER (obdo, o_blocks); - CHECK_MEMBER (obdo, o_rdev); - CHECK_MEMBER (obdo, o_blksize); - CHECK_MEMBER (obdo, o_mode); - CHECK_MEMBER (obdo, o_uid); - CHECK_MEMBER (obdo, o_gid); - CHECK_MEMBER (obdo, o_flags); - CHECK_MEMBER (obdo, o_nlink); - CHECK_MEMBER (obdo, o_generation); - CHECK_MEMBER (obdo, o_valid); - CHECK_MEMBER (obdo, o_obdflags); - CHECK_MEMBER (obdo, o_easize); - CHECK_MEMBER (obdo, o_inline); - - CHECK_VALUE (OBD_MD_FLALL); - CHECK_VALUE (OBD_MD_FLID); - CHECK_VALUE (OBD_MD_FLATIME); - CHECK_VALUE (OBD_MD_FLMTIME); - CHECK_VALUE (OBD_MD_FLCTIME); - CHECK_VALUE (OBD_MD_FLSIZE); - CHECK_VALUE (OBD_MD_FLBLOCKS); - CHECK_VALUE (OBD_MD_FLBLKSZ); - CHECK_VALUE (OBD_MD_FLMODE); - CHECK_VALUE (OBD_MD_FLTYPE); - CHECK_VALUE (OBD_MD_FLUID); - CHECK_VALUE (OBD_MD_FLGID); - CHECK_VALUE (OBD_MD_FLFLAGS); - CHECK_VALUE (OBD_MD_FLOBDFLG); - CHECK_VALUE (OBD_MD_FLNLINK); - CHECK_VALUE (OBD_MD_FLGENER); - CHECK_VALUE (OBD_MD_FLINLINE); - CHECK_VALUE (OBD_MD_FLRDEV); - CHECK_VALUE (OBD_MD_FLEASIZE); - CHECK_VALUE (OBD_MD_LINKNAME); - CHECK_VALUE (OBD_MD_FLHANDLE); - CHECK_VALUE (OBD_MD_FLCKSUM); - CHECK_VALUE (OBD_MD_FLQOS); - CHECK_VALUE (OBD_MD_FLOSCOPQ); - CHECK_VALUE (OBD_MD_FLCOOKIE); - CHECK_VALUE (OBD_MD_FLGROUP); + CHECK_VALUE(VALUE); + CHECK_DEFINE(VALUE); } void -check_lov_mds_md_v1 (void) +check_lustre_handle(void) { - BLANK_LINE (); - CHECK_STRUCT (lov_mds_md_v1); - CHECK_MEMBER (lov_mds_md_v1, lmm_magic); - CHECK_MEMBER (lov_mds_md_v1, lmm_pattern); - CHECK_MEMBER (lov_mds_md_v1, lmm_object_id); - CHECK_MEMBER (lov_mds_md_v1, lmm_object_gr); - CHECK_MEMBER (lov_mds_md_v1, lmm_stripe_size); - CHECK_MEMBER (lov_mds_md_v1, lmm_stripe_count); - CHECK_MEMBER (lov_mds_md_v1, lmm_objects); + BLANK_LINE(); + CHECK_STRUCT(lustre_handle); + CHECK_MEMBER(lustre_handle, cookie); +} + +void +check_lustre_msg(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lustre_msg); + CHECK_MEMBER(lustre_msg, handle); + CHECK_MEMBER(lustre_msg, magic); + CHECK_MEMBER(lustre_msg, type); + CHECK_MEMBER(lustre_msg, version); + CHECK_MEMBER(lustre_msg, opc); + CHECK_MEMBER(lustre_msg, last_xid); + CHECK_MEMBER(lustre_msg, last_committed); + CHECK_MEMBER(lustre_msg, transno); + CHECK_MEMBER(lustre_msg, status); + CHECK_MEMBER(lustre_msg, flags); + CHECK_MEMBER(lustre_msg, bufcount); + CHECK_MEMBER(lustre_msg, buflens[7]); +} + +void +check_obdo(void) +{ + BLANK_LINE(); + CHECK_STRUCT(obdo); + CHECK_MEMBER(obdo, o_id); + CHECK_MEMBER(obdo, o_gr); + CHECK_MEMBER(obdo, o_atime); + CHECK_MEMBER(obdo, o_mtime); + CHECK_MEMBER(obdo, o_ctime); + CHECK_MEMBER(obdo, o_size); + CHECK_MEMBER(obdo, o_blocks); + CHECK_MEMBER(obdo, o_rdev); + CHECK_MEMBER(obdo, o_blksize); + CHECK_MEMBER(obdo, o_mode); + CHECK_MEMBER(obdo, o_uid); + CHECK_MEMBER(obdo, o_gid); + CHECK_MEMBER(obdo, o_flags); + CHECK_MEMBER(obdo, o_nlink); + CHECK_MEMBER(obdo, o_generation); + CHECK_MEMBER(obdo, o_valid); + CHECK_MEMBER(obdo, o_obdflags); + CHECK_MEMBER(obdo, o_easize); + CHECK_MEMBER(obdo, o_inline); + + CHECK_VALUE(OBD_MD_FLID); + CHECK_VALUE(OBD_MD_FLATIME); + CHECK_VALUE(OBD_MD_FLMTIME); + CHECK_VALUE(OBD_MD_FLCTIME); + CHECK_VALUE(OBD_MD_FLSIZE); + CHECK_VALUE(OBD_MD_FLBLOCKS); + CHECK_VALUE(OBD_MD_FLBLKSZ); + CHECK_VALUE(OBD_MD_FLMODE); + CHECK_VALUE(OBD_MD_FLTYPE); + CHECK_VALUE(OBD_MD_FLUID); + CHECK_VALUE(OBD_MD_FLGID); + CHECK_VALUE(OBD_MD_FLFLAGS); + CHECK_VALUE(OBD_MD_FLOBDFLG); + CHECK_VALUE(OBD_MD_FLNLINK); + CHECK_VALUE(OBD_MD_FLGENER); + CHECK_VALUE(OBD_MD_FLINLINE); + CHECK_VALUE(OBD_MD_FLRDEV); + CHECK_VALUE(OBD_MD_FLEASIZE); + CHECK_VALUE(OBD_MD_LINKNAME); + CHECK_VALUE(OBD_MD_FLHANDLE); + CHECK_VALUE(OBD_MD_FLCKSUM); + CHECK_VALUE(OBD_MD_FLQOS); + CHECK_VALUE(OBD_MD_FLOSCOPQ); + CHECK_VALUE(OBD_MD_FLCOOKIE); + CHECK_VALUE(OBD_MD_FLGROUP); +} + +void +check_lov_mds_md_v1(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lov_mds_md_v1); + CHECK_MEMBER(lov_mds_md_v1, lmm_magic); + CHECK_MEMBER(lov_mds_md_v1, lmm_pattern); + CHECK_MEMBER(lov_mds_md_v1, lmm_object_id); + CHECK_MEMBER(lov_mds_md_v1, lmm_object_gr); + CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_size); + CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_count); + CHECK_MEMBER(lov_mds_md_v1, lmm_objects); + + BLANK_LINE(); + CHECK_STRUCT(lov_ost_data_v1); + CHECK_MEMBER(lov_ost_data_v1, l_object_id); + CHECK_MEMBER(lov_ost_data_v1, l_object_gr); + CHECK_MEMBER(lov_ost_data_v1, l_ost_gen); + CHECK_MEMBER(lov_ost_data_v1, l_ost_idx); + + CHECK_VALUE(LOV_MAGIC_V0); + CHECK_VALUE(LOV_MAGIC_V1); + + CHECK_VALUE(LOV_PATTERN_RAID0); + CHECK_VALUE(LOV_PATTERN_RAID1); +} + +void +check_obd_statfs(void) +{ + BLANK_LINE(); + CHECK_STRUCT(obd_statfs); + CHECK_MEMBER(obd_statfs, os_type); + CHECK_MEMBER(obd_statfs, os_blocks); + CHECK_MEMBER(obd_statfs, os_bfree); + CHECK_MEMBER(obd_statfs, os_bavail); + CHECK_MEMBER(obd_statfs, os_ffree); + CHECK_MEMBER(obd_statfs, os_fsid); + CHECK_MEMBER(obd_statfs, os_bsize); + CHECK_MEMBER(obd_statfs, os_namelen); + CHECK_MEMBER(obd_statfs, os_spare); +} + +void +check_obd_ioobj(void) +{ + BLANK_LINE(); + CHECK_STRUCT(obd_ioobj); + CHECK_MEMBER(obd_ioobj, ioo_id); + CHECK_MEMBER(obd_ioobj, ioo_gr); + CHECK_MEMBER(obd_ioobj, ioo_type); + CHECK_MEMBER(obd_ioobj, ioo_bufcnt); +} + +void +check_niobuf_remote(void) +{ + BLANK_LINE(); + CHECK_STRUCT(niobuf_remote); + CHECK_MEMBER(niobuf_remote, offset); + CHECK_MEMBER(niobuf_remote, len); + CHECK_MEMBER(niobuf_remote, flags); - BLANK_LINE (); - CHECK_STRUCT (lov_ost_data_v1); - CHECK_MEMBER (lov_ost_data_v1, l_object_id); - CHECK_MEMBER (lov_ost_data_v1, l_object_gr); - CHECK_MEMBER (lov_ost_data_v1, l_ost_gen); - CHECK_MEMBER (lov_ost_data_v1, l_ost_idx); - - CHECK_VALUE (LOV_MAGIC_V0); - CHECK_VALUE (LOV_MAGIC_V1); - - CHECK_VALUE (LOV_PATTERN_RAID0); - CHECK_VALUE (LOV_PATTERN_RAID1); -} - -void -check_obd_statfs (void) -{ - BLANK_LINE (); - CHECK_STRUCT (obd_statfs); - CHECK_MEMBER (obd_statfs, os_type); - CHECK_MEMBER (obd_statfs, os_blocks); - CHECK_MEMBER (obd_statfs, os_bfree); - CHECK_MEMBER (obd_statfs, os_bavail); - CHECK_MEMBER (obd_statfs, os_ffree); - CHECK_MEMBER (obd_statfs, os_fsid); - CHECK_MEMBER (obd_statfs, os_bsize); - CHECK_MEMBER (obd_statfs, os_namelen); - CHECK_MEMBER (obd_statfs, os_spare); -} - -void -check_obd_ioobj (void) -{ - BLANK_LINE (); - CHECK_STRUCT (obd_ioobj); - CHECK_MEMBER (obd_ioobj, ioo_id); - CHECK_MEMBER (obd_ioobj, ioo_gr); - CHECK_MEMBER (obd_ioobj, ioo_type); - CHECK_MEMBER (obd_ioobj, ioo_bufcnt); -} - -void -check_niobuf_remote (void) -{ - BLANK_LINE (); - CHECK_STRUCT (niobuf_remote); - CHECK_MEMBER (niobuf_remote, offset); - CHECK_MEMBER (niobuf_remote, len); - CHECK_MEMBER (niobuf_remote, flags); - - CHECK_VALUE (OBD_BRW_READ); - CHECK_VALUE (OBD_BRW_WRITE); - CHECK_VALUE (OBD_BRW_CREATE); - CHECK_VALUE (OBD_BRW_SYNC); -} - -void -check_ost_body (void) -{ - BLANK_LINE (); - CHECK_STRUCT (ost_body); - CHECK_MEMBER (ost_body, oa); -} - -void -check_ll_fid (void) -{ - BLANK_LINE (); - CHECK_STRUCT (ll_fid); - CHECK_MEMBER (ll_fid, id); - CHECK_MEMBER (ll_fid, generation); - CHECK_MEMBER (ll_fid, f_type); + CHECK_VALUE(OBD_BRW_READ); + CHECK_VALUE(OBD_BRW_WRITE); + CHECK_VALUE(OBD_BRW_CREATE); + CHECK_VALUE(OBD_BRW_SYNC); } void -check_mds_status_req (void) +check_ost_body(void) { - BLANK_LINE (); - CHECK_STRUCT (mds_status_req); - CHECK_MEMBER (mds_status_req, flags); - CHECK_MEMBER (mds_status_req, repbuf); + BLANK_LINE(); + CHECK_STRUCT(ost_body); + CHECK_MEMBER(ost_body, oa); } void -check_mds_body (void) +check_ll_fid(void) { - BLANK_LINE (); - CHECK_STRUCT (mds_body); - CHECK_MEMBER (mds_body, fid1); - CHECK_MEMBER (mds_body, fid2); - CHECK_MEMBER (mds_body, handle); - CHECK_MEMBER (mds_body, size); - CHECK_MEMBER (mds_body, blocks); - CHECK_MEMBER (mds_body, ino); - CHECK_MEMBER (mds_body, valid); - CHECK_MEMBER (mds_body, fsuid); - CHECK_MEMBER (mds_body, fsgid); - CHECK_MEMBER (mds_body, capability); - CHECK_MEMBER (mds_body, mode); - CHECK_MEMBER (mds_body, uid); - CHECK_MEMBER (mds_body, gid); - CHECK_MEMBER (mds_body, mtime); - CHECK_MEMBER (mds_body, ctime); - CHECK_MEMBER (mds_body, atime); - CHECK_MEMBER (mds_body, flags); - CHECK_MEMBER (mds_body, rdev); - CHECK_MEMBER (mds_body, nlink); - CHECK_MEMBER (mds_body, generation); - CHECK_MEMBER (mds_body, suppgid); - CHECK_MEMBER (mds_body, eadatasize); + BLANK_LINE(); + CHECK_STRUCT(ll_fid); + CHECK_MEMBER(ll_fid, id); + CHECK_MEMBER(ll_fid, generation); + CHECK_MEMBER(ll_fid, f_type); } void -check_mds_rec_setattr (void) +check_mds_status_req(void) { - BLANK_LINE (); - CHECK_STRUCT (mds_rec_setattr); - CHECK_MEMBER (mds_rec_setattr, sa_opcode); - CHECK_MEMBER (mds_rec_setattr, sa_fsuid); - CHECK_MEMBER (mds_rec_setattr, sa_fsgid); - CHECK_MEMBER (mds_rec_setattr, sa_cap); - CHECK_MEMBER (mds_rec_setattr, sa_reserved); - CHECK_MEMBER (mds_rec_setattr, sa_valid); - CHECK_MEMBER (mds_rec_setattr, sa_fid); - CHECK_MEMBER (mds_rec_setattr, sa_mode); - CHECK_MEMBER (mds_rec_setattr, sa_uid); - CHECK_MEMBER (mds_rec_setattr, sa_gid); - CHECK_MEMBER (mds_rec_setattr, sa_attr_flags); - CHECK_MEMBER (mds_rec_setattr, sa_size); - CHECK_MEMBER (mds_rec_setattr, sa_atime); - CHECK_MEMBER (mds_rec_setattr, sa_mtime); - CHECK_MEMBER (mds_rec_setattr, sa_ctime); - CHECK_MEMBER (mds_rec_setattr, sa_suppgid); + BLANK_LINE(); + CHECK_STRUCT(mds_status_req); + CHECK_MEMBER(mds_status_req, flags); + CHECK_MEMBER(mds_status_req, repbuf); } void -check_mds_rec_create (void) +check_mds_body(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mds_body); + CHECK_MEMBER(mds_body, fid1); + CHECK_MEMBER(mds_body, fid2); + CHECK_MEMBER(mds_body, handle); + CHECK_MEMBER(mds_body, size); + CHECK_MEMBER(mds_body, blocks); + CHECK_MEMBER(mds_body, ino); + CHECK_MEMBER(mds_body, valid); + CHECK_MEMBER(mds_body, fsuid); + CHECK_MEMBER(mds_body, fsgid); + CHECK_MEMBER(mds_body, capability); + CHECK_MEMBER(mds_body, mode); + CHECK_MEMBER(mds_body, uid); + CHECK_MEMBER(mds_body, gid); + CHECK_MEMBER(mds_body, mtime); + CHECK_MEMBER(mds_body, ctime); + CHECK_MEMBER(mds_body, atime); + CHECK_MEMBER(mds_body, flags); + CHECK_MEMBER(mds_body, rdev); + CHECK_MEMBER(mds_body, nlink); + CHECK_MEMBER(mds_body, generation); + CHECK_MEMBER(mds_body, suppgid); + CHECK_MEMBER(mds_body, eadatasize); +} + +void +check_mds_rec_setattr(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mds_rec_setattr); + CHECK_MEMBER(mds_rec_setattr, sa_opcode); + CHECK_MEMBER(mds_rec_setattr, sa_fsuid); + CHECK_MEMBER(mds_rec_setattr, sa_fsgid); + CHECK_MEMBER(mds_rec_setattr, sa_cap); + CHECK_MEMBER(mds_rec_setattr, sa_suppgid); + CHECK_MEMBER(mds_rec_setattr, sa_valid); + CHECK_MEMBER(mds_rec_setattr, sa_fid); + CHECK_MEMBER(mds_rec_setattr, sa_mode); + CHECK_MEMBER(mds_rec_setattr, sa_uid); + CHECK_MEMBER(mds_rec_setattr, sa_gid); + CHECK_MEMBER(mds_rec_setattr, sa_attr_flags); + CHECK_MEMBER(mds_rec_setattr, sa_size); + CHECK_MEMBER(mds_rec_setattr, sa_atime); + CHECK_MEMBER(mds_rec_setattr, sa_mtime); + CHECK_MEMBER(mds_rec_setattr, sa_ctime); +} + +void +check_mds_rec_create(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mds_rec_create); + CHECK_MEMBER(mds_rec_create, cr_opcode); + CHECK_MEMBER(mds_rec_create, cr_fsuid); + CHECK_MEMBER(mds_rec_create, cr_fsgid); + CHECK_MEMBER(mds_rec_create, cr_cap); + CHECK_MEMBER(mds_rec_create, cr_flags); + CHECK_MEMBER(mds_rec_create, cr_mode); + CHECK_MEMBER(mds_rec_create, cr_fid); + CHECK_MEMBER(mds_rec_create, cr_replayfid); + CHECK_MEMBER(mds_rec_create, cr_time); + CHECK_MEMBER(mds_rec_create, cr_rdev); + CHECK_MEMBER(mds_rec_create, cr_suppgid); +} + +void +check_mds_rec_link(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mds_rec_link); + CHECK_MEMBER(mds_rec_link, lk_opcode); + CHECK_MEMBER(mds_rec_link, lk_fsuid); + CHECK_MEMBER(mds_rec_link, lk_fsgid); + CHECK_MEMBER(mds_rec_link, lk_cap); + CHECK_MEMBER(mds_rec_link, lk_suppgid1); + CHECK_MEMBER(mds_rec_link, lk_suppgid2); + CHECK_MEMBER(mds_rec_link, lk_fid1); + CHECK_MEMBER(mds_rec_link, lk_fid2); + CHECK_MEMBER(mds_rec_link, lk_time); +} + +void +check_mds_rec_unlink(void) { - BLANK_LINE (); - CHECK_STRUCT (mds_rec_create); - CHECK_MEMBER (mds_rec_create, cr_opcode); - CHECK_MEMBER (mds_rec_create, cr_fsuid); - CHECK_MEMBER (mds_rec_create, cr_fsgid); - CHECK_MEMBER (mds_rec_create, cr_cap); - CHECK_MEMBER (mds_rec_create, cr_flags); - CHECK_MEMBER (mds_rec_create, cr_mode); - CHECK_MEMBER (mds_rec_create, cr_fid); - CHECK_MEMBER (mds_rec_create, cr_replayfid); - CHECK_MEMBER (mds_rec_create, cr_time); - CHECK_MEMBER (mds_rec_create, cr_rdev); - CHECK_MEMBER (mds_rec_create, cr_suppgid); + BLANK_LINE(); + CHECK_STRUCT(mds_rec_unlink); + CHECK_MEMBER(mds_rec_unlink, ul_opcode); + CHECK_MEMBER(mds_rec_unlink, ul_fsuid); + CHECK_MEMBER(mds_rec_unlink, ul_fsgid); + CHECK_MEMBER(mds_rec_unlink, ul_cap); + CHECK_MEMBER(mds_rec_unlink, ul_suppgid); + CHECK_MEMBER(mds_rec_unlink, ul_mode); + CHECK_MEMBER(mds_rec_unlink, ul_fid1); + CHECK_MEMBER(mds_rec_unlink, ul_fid2); + CHECK_MEMBER(mds_rec_unlink, ul_time); } void -check_mds_rec_link (void) +check_mds_rec_rename(void) { - BLANK_LINE (); - CHECK_STRUCT (mds_rec_link); - CHECK_MEMBER (mds_rec_link, lk_opcode); - CHECK_MEMBER (mds_rec_link, lk_fsuid); - CHECK_MEMBER (mds_rec_link, lk_fsgid); - CHECK_MEMBER (mds_rec_link, lk_cap); - CHECK_MEMBER (mds_rec_link, lk_suppgid1); - CHECK_MEMBER (mds_rec_link, lk_suppgid2); - CHECK_MEMBER (mds_rec_link, lk_fid1); - CHECK_MEMBER (mds_rec_link, lk_fid2); - CHECK_MEMBER (mds_rec_link, lk_time); + BLANK_LINE(); + CHECK_STRUCT(mds_rec_rename); + CHECK_MEMBER(mds_rec_rename, rn_opcode); + CHECK_MEMBER(mds_rec_rename, rn_fsuid); + CHECK_MEMBER(mds_rec_rename, rn_fsgid); + CHECK_MEMBER(mds_rec_rename, rn_cap); + CHECK_MEMBER(mds_rec_rename, rn_suppgid1); + CHECK_MEMBER(mds_rec_rename, rn_suppgid2); + CHECK_MEMBER(mds_rec_rename, rn_fid1); + CHECK_MEMBER(mds_rec_rename, rn_fid2); + CHECK_MEMBER(mds_rec_rename, rn_time); } void -check_mds_rec_unlink (void) +check_lov_desc(void) { - BLANK_LINE (); - CHECK_STRUCT (mds_rec_unlink); - CHECK_MEMBER (mds_rec_unlink, ul_opcode); - CHECK_MEMBER (mds_rec_unlink, ul_fsuid); - CHECK_MEMBER (mds_rec_unlink, ul_fsgid); - CHECK_MEMBER (mds_rec_unlink, ul_cap); - CHECK_MEMBER (mds_rec_unlink, ul_suppgid); - CHECK_MEMBER (mds_rec_unlink, ul_mode); - CHECK_MEMBER (mds_rec_unlink, ul_fid1); - CHECK_MEMBER (mds_rec_unlink, ul_fid2); - CHECK_MEMBER (mds_rec_unlink, ul_time); + BLANK_LINE(); + CHECK_STRUCT(lov_desc); + CHECK_MEMBER(lov_desc, ld_tgt_count); + CHECK_MEMBER(lov_desc, ld_active_tgt_count); + CHECK_MEMBER(lov_desc, ld_default_stripe_count); + CHECK_MEMBER(lov_desc, ld_pattern); + CHECK_MEMBER(lov_desc, ld_default_stripe_size); + CHECK_MEMBER(lov_desc, ld_default_stripe_offset); + CHECK_MEMBER(lov_desc, ld_uuid); } void -check_mds_rec_rename (void) +check_ldlm_res_id(void) { - BLANK_LINE (); - CHECK_STRUCT (mds_rec_rename); - CHECK_MEMBER (mds_rec_rename, rn_opcode); - CHECK_MEMBER (mds_rec_rename, rn_fsuid); - CHECK_MEMBER (mds_rec_rename, rn_fsgid); - CHECK_MEMBER (mds_rec_rename, rn_cap); - CHECK_MEMBER (mds_rec_rename, rn_suppgid1); - CHECK_MEMBER (mds_rec_rename, rn_suppgid2); - CHECK_MEMBER (mds_rec_rename, rn_fid1); - CHECK_MEMBER (mds_rec_rename, rn_fid2); - CHECK_MEMBER (mds_rec_rename, rn_time); + BLANK_LINE(); + CHECK_STRUCT(ldlm_res_id); + CHECK_MEMBER(ldlm_res_id, name[RES_NAME_SIZE]); } void -check_lov_desc (void) +check_ldlm_extent(void) { - BLANK_LINE (); - CHECK_STRUCT (lov_desc); - CHECK_MEMBER (lov_desc, ld_tgt_count); - CHECK_MEMBER (lov_desc, ld_active_tgt_count); - CHECK_MEMBER (lov_desc, ld_default_stripe_count); - CHECK_MEMBER (lov_desc, ld_pattern); - CHECK_MEMBER (lov_desc, ld_default_stripe_size); - CHECK_MEMBER (lov_desc, ld_default_stripe_offset); - CHECK_MEMBER (lov_desc, ld_uuid); + BLANK_LINE(); + CHECK_STRUCT(ldlm_extent); + CHECK_MEMBER(ldlm_extent, start); + CHECK_MEMBER(ldlm_extent, end); } void -check_ldlm_res_id (void) +check_ldlm_flock(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_res_id); - CHECK_MEMBER (ldlm_res_id, name[RES_NAME_SIZE]); + BLANK_LINE(); + CHECK_STRUCT(ldlm_flock); + CHECK_MEMBER(ldlm_flock, start); + CHECK_MEMBER(ldlm_flock, end); + CHECK_MEMBER(ldlm_flock, blocking_export); + CHECK_MEMBER(ldlm_flock, blocking_pid); + CHECK_MEMBER(ldlm_flock, pid); } void -check_ldlm_extent (void) +check_ldlm_intent(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_extent); - CHECK_MEMBER (ldlm_extent, start); - CHECK_MEMBER (ldlm_extent, end); + BLANK_LINE(); + CHECK_STRUCT(ldlm_intent); + CHECK_MEMBER(ldlm_intent, opc); } void -check_ldlm_flock (void) +check_ldlm_resource_desc(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_flock); - CHECK_MEMBER (ldlm_flock, start); - CHECK_MEMBER (ldlm_flock, end); - CHECK_MEMBER (ldlm_flock, pid); - CHECK_MEMBER (ldlm_flock, blocking_pid); + BLANK_LINE(); + CHECK_STRUCT(ldlm_resource_desc); + CHECK_MEMBER(ldlm_resource_desc, lr_type); + CHECK_MEMBER(ldlm_resource_desc, lr_name); + CHECK_MEMBER(ldlm_resource_desc, lr_version[RES_VERSION_SIZE]); } void -check_ldlm_intent (void) +check_ldlm_lock_desc(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_intent); - CHECK_MEMBER (ldlm_intent, opc); + BLANK_LINE(); + CHECK_STRUCT(ldlm_lock_desc); + CHECK_MEMBER(ldlm_lock_desc, l_resource); + CHECK_MEMBER(ldlm_lock_desc, l_req_mode); + CHECK_MEMBER(ldlm_lock_desc, l_granted_mode); + CHECK_MEMBER(ldlm_lock_desc, l_policy_data); + CHECK_MEMBER(ldlm_lock_desc, l_version[RES_VERSION_SIZE]); } void -check_ldlm_resource_desc (void) +check_ldlm_request(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_resource_desc); - CHECK_MEMBER (ldlm_resource_desc, lr_type); - CHECK_MEMBER (ldlm_resource_desc, lr_name); - CHECK_MEMBER (ldlm_resource_desc, lr_version[RES_VERSION_SIZE]); + BLANK_LINE(); + CHECK_STRUCT(ldlm_request); + CHECK_MEMBER(ldlm_request, lock_flags); + CHECK_MEMBER(ldlm_request, lock_desc); + CHECK_MEMBER(ldlm_request, lock_handle1); + CHECK_MEMBER(ldlm_request, lock_handle2); } void -check_ldlm_lock_desc (void) +check_ldlm_reply(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_lock_desc); - CHECK_MEMBER (ldlm_lock_desc, l_resource); - CHECK_MEMBER (ldlm_lock_desc, l_req_mode); - CHECK_MEMBER (ldlm_lock_desc, l_granted_mode); - CHECK_MEMBER (ldlm_lock_desc, l_policy_data); - CHECK_MEMBER (ldlm_lock_desc, l_version[RES_VERSION_SIZE]); + BLANK_LINE(); + CHECK_STRUCT(ldlm_reply); + CHECK_MEMBER(ldlm_reply, lock_flags); + CHECK_MEMBER(ldlm_reply, lock_mode); + CHECK_MEMBER(ldlm_reply, lock_resource_name); + CHECK_MEMBER(ldlm_reply, lock_handle); + CHECK_MEMBER(ldlm_reply, lock_policy_data); + CHECK_MEMBER(ldlm_reply, lock_policy_res1); + CHECK_MEMBER(ldlm_reply, lock_policy_res2); } void -check_ldlm_request (void) +check_ptlbd_op(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_request); - CHECK_MEMBER (ldlm_request, lock_flags); - CHECK_MEMBER (ldlm_request, lock_desc); - CHECK_MEMBER (ldlm_request, lock_handle1); - CHECK_MEMBER (ldlm_request, lock_handle2); + BLANK_LINE(); + CHECK_STRUCT(ptlbd_op); + CHECK_MEMBER(ptlbd_op, op_cmd); + CHECK_MEMBER(ptlbd_op, op_lun); + CHECK_MEMBER(ptlbd_op, op_niob_cnt); + CHECK_MEMBER(ptlbd_op, op__padding); + CHECK_MEMBER(ptlbd_op, op_block_cnt); } void -check_ldlm_reply (void) +check_ptlbd_niob(void) { - BLANK_LINE (); - CHECK_STRUCT (ldlm_reply); - CHECK_MEMBER (ldlm_reply, lock_flags); - CHECK_MEMBER (ldlm_reply, lock_mode); - CHECK_MEMBER (ldlm_reply, lock_resource_name); - CHECK_MEMBER (ldlm_reply, lock_handle); - CHECK_MEMBER (ldlm_reply, lock_policy_data); - CHECK_MEMBER (ldlm_reply, lock_policy_res1); - CHECK_MEMBER (ldlm_reply, lock_policy_res2); + BLANK_LINE(); + CHECK_STRUCT(ptlbd_niob); + CHECK_MEMBER(ptlbd_niob, n_xid); + CHECK_MEMBER(ptlbd_niob, n_block_nr); + CHECK_MEMBER(ptlbd_niob, n_offset); + CHECK_MEMBER(ptlbd_niob, n_length); } void -check_ptlbd_op (void) +check_ptlbd_rsp(void) { - BLANK_LINE (); - CHECK_STRUCT (ptlbd_op); - CHECK_MEMBER (ptlbd_op, op_cmd); - CHECK_MEMBER (ptlbd_op, op_lun); - CHECK_MEMBER (ptlbd_op, op_niob_cnt); - CHECK_MEMBER (ptlbd_op, op__padding); - CHECK_MEMBER (ptlbd_op, op_block_cnt); + BLANK_LINE(); + CHECK_STRUCT(ptlbd_rsp); + CHECK_MEMBER(ptlbd_rsp, r_status); + CHECK_MEMBER(ptlbd_rsp, r_error_cnt); } void -check_ptlbd_niob (void) +check_llog_logid(void) { - BLANK_LINE (); - CHECK_STRUCT (ptlbd_niob); - CHECK_MEMBER (ptlbd_niob, n_xid); - CHECK_MEMBER (ptlbd_niob, n_block_nr); - CHECK_MEMBER (ptlbd_niob, n_offset); - CHECK_MEMBER (ptlbd_niob, n_length); + BLANK_LINE(); + CHECK_STRUCT(llog_logid); + CHECK_MEMBER(llog_logid, lgl_oid); + CHECK_MEMBER(llog_logid, lgl_ogr); + CHECK_MEMBER(llog_logid, lgl_ogen); } void -check_ptlbd_rsp (void) +check_llog_rec_hdr(void) { - BLANK_LINE (); - CHECK_STRUCT (ptlbd_rsp); - CHECK_MEMBER (ptlbd_rsp, r_status); - CHECK_MEMBER (ptlbd_rsp, r_error_cnt); + BLANK_LINE(); + CHECK_STRUCT(llog_rec_hdr); + CHECK_MEMBER(llog_rec_hdr, lrh_len); + CHECK_MEMBER(llog_rec_hdr, lrh_index); + CHECK_MEMBER(llog_rec_hdr, lrh_type); } void -check_llog_logid (void) +check_llog_rec_tail(void) { - BLANK_LINE (); - CHECK_STRUCT (llog_logid); - CHECK_MEMBER (llog_logid, lgl_oid); - CHECK_MEMBER (llog_logid, lgl_ogr); - CHECK_MEMBER (llog_logid, lgl_ogen); + BLANK_LINE(); + CHECK_STRUCT(llog_rec_tail); + CHECK_MEMBER(llog_rec_tail, lrt_len); + CHECK_MEMBER(llog_rec_tail, lrt_index); } void -check_llog_rec_hdr (void) +check_llog_log_hdr(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_log_hdr); + CHECK_MEMBER(llog_log_hdr, llh_hdr); + CHECK_MEMBER(llog_log_hdr, llh_timestamp); + CHECK_MEMBER(llog_log_hdr, llh_count); + CHECK_MEMBER(llog_log_hdr, llh_bitmap_offset); + CHECK_MEMBER(llog_log_hdr, llh_size); + CHECK_MEMBER(llog_log_hdr, llh_flags); + CHECK_MEMBER(llog_log_hdr, llh_cat_idx); + CHECK_MEMBER(llog_log_hdr, llh_tgtuuid); + CHECK_MEMBER(llog_log_hdr, llh_reserved); + CHECK_MEMBER(llog_log_hdr, llh_bitmap); + CHECK_MEMBER(llog_log_hdr, llh_tail); +} + +void +check_llog_cookie(void) { - BLANK_LINE (); - CHECK_STRUCT (llog_rec_hdr); - CHECK_MEMBER (llog_rec_hdr, lrh_len); - CHECK_MEMBER (llog_rec_hdr, lrh_index); - CHECK_MEMBER (llog_rec_hdr, lrh_type); + BLANK_LINE(); + CHECK_STRUCT(llog_cookie); + CHECK_MEMBER(llog_cookie, lgc_lgl); + CHECK_MEMBER(llog_cookie, lgc_subsys); + CHECK_MEMBER(llog_cookie, lgc_index); } void -check_llog_rec_tail (void) +check_llogd_body(void) { - BLANK_LINE (); - CHECK_STRUCT (llog_rec_tail); - CHECK_MEMBER (llog_rec_tail, lrt_len); - CHECK_MEMBER (llog_rec_tail, lrt_index); + BLANK_LINE(); + CHECK_STRUCT(llogd_body); + CHECK_MEMBER(llogd_body, lgd_logid); + CHECK_MEMBER(llogd_body, lgd_len); + CHECK_MEMBER(llogd_body, lgd_index); + CHECK_MEMBER(llogd_body, lgd_saved_index); + CHECK_MEMBER(llogd_body, lgd_cur_offset); + + CHECK_VALUE(LLOG_ORIGIN_HANDLE_CREATE); + CHECK_VALUE(LLOG_ORIGIN_HANDLE_NEXT_BLOCK); + CHECK_VALUE(LLOG_ORIGIN_HANDLE_READ_HEADER); + CHECK_VALUE(LLOG_ORIGIN_HANDLE_WRITE_REC); + CHECK_VALUE(LLOG_ORIGIN_HANDLE_CLOSE); } int -main (int argc, char **argv) -{ - printf ("void lustre_assert_wire_constants (void)\n" - "{\n"); - - COMMENT ("Wire protocol assertions generated by 'wirecheck'"); - BLANK_LINE (); - - COMMENT ("Constants..."); - CHECK_DEFINE (PTLRPC_MSG_MAGIC); - CHECK_DEFINE (PTLRPC_MSG_VERSION); - - CHECK_VALUE (PTL_RPC_MSG_REQUEST); - CHECK_VALUE (PTL_RPC_MSG_ERR); - CHECK_VALUE (PTL_RPC_MSG_REPLY); - - CHECK_VALUE (MSG_LAST_REPLAY); - CHECK_VALUE (MSG_RESENT); - - CHECK_VALUE (MSG_CONNECT_RECOVERING); - CHECK_VALUE (MSG_CONNECT_RECONNECT); - CHECK_VALUE (MSG_CONNECT_REPLAYABLE); - - CHECK_VALUE (OST_REPLY); - CHECK_VALUE (OST_GETATTR); - CHECK_VALUE (OST_SETATTR); - CHECK_VALUE (OST_READ); - CHECK_VALUE (OST_WRITE); - CHECK_VALUE (OST_CREATE); - CHECK_VALUE (OST_DESTROY); - CHECK_VALUE (OST_GET_INFO); - CHECK_VALUE (OST_CONNECT); - CHECK_VALUE (OST_DISCONNECT); - CHECK_VALUE (OST_PUNCH); - CHECK_VALUE (OST_OPEN); - CHECK_VALUE (OST_CLOSE); - CHECK_VALUE (OST_STATFS); - CHECK_VALUE (OST_SAN_READ); - CHECK_VALUE (OST_SAN_WRITE); - CHECK_VALUE (OST_SYNC); - CHECK_VALUE (OST_LAST_OPC); - CHECK_VALUE (OST_FIRST_OPC); - - CHECK_VALUE (OBD_FL_INLINEDATA); - CHECK_VALUE (OBD_FL_OBDMDEXISTS); - - CHECK_DEFINE (OBD_OBJECT_EOF); - - CHECK_VALUE (OST_REQ_HAS_OA1); - - CHECK_VALUE (MDS_GETATTR); - CHECK_VALUE (MDS_GETATTR_NAME); - CHECK_VALUE (MDS_CLOSE); - CHECK_VALUE (MDS_REINT); - CHECK_VALUE (MDS_READPAGE); - CHECK_VALUE (MDS_CONNECT); - CHECK_VALUE (MDS_DISCONNECT); - CHECK_VALUE (MDS_GETSTATUS); - CHECK_VALUE (MDS_STATFS); - CHECK_VALUE (MDS_GETLOVINFO); - CHECK_VALUE (MDS_LAST_OPC); - CHECK_VALUE (MDS_FIRST_OPC); - - CHECK_VALUE (REINT_SETATTR); - CHECK_VALUE (REINT_CREATE); - CHECK_VALUE (REINT_LINK); - CHECK_VALUE (REINT_UNLINK); - CHECK_VALUE (REINT_RENAME); - CHECK_VALUE (REINT_OPEN); - CHECK_VALUE (REINT_MAX); - - CHECK_VALUE (DISP_IT_EXECD); - CHECK_VALUE (DISP_LOOKUP_EXECD); - CHECK_VALUE (DISP_LOOKUP_NEG); - CHECK_VALUE (DISP_LOOKUP_POS); - CHECK_VALUE (DISP_OPEN_CREATE); - CHECK_VALUE (DISP_OPEN_OPEN); - - CHECK_VALUE (MDS_STATUS_CONN); - CHECK_VALUE (MDS_STATUS_LOV); - - CHECK_VALUE (MDS_OPEN_HAS_EA); - - CHECK_VALUE (LDLM_ENQUEUE); - CHECK_VALUE (LDLM_CONVERT); - CHECK_VALUE (LDLM_CANCEL); - CHECK_VALUE (LDLM_BL_CALLBACK); - CHECK_VALUE (LDLM_CP_CALLBACK); - CHECK_VALUE (LDLM_LAST_OPC); - CHECK_VALUE (LDLM_FIRST_OPC); - - CHECK_VALUE (PTLBD_QUERY); - CHECK_VALUE (PTLBD_READ); - CHECK_VALUE (PTLBD_WRITE); - CHECK_VALUE (PTLBD_FLUSH); - CHECK_VALUE (PTLBD_CONNECT); - CHECK_VALUE (PTLBD_DISCONNECT); - CHECK_VALUE (PTLBD_LAST_OPC); - CHECK_VALUE (PTLBD_FIRST_OPC); - - CHECK_VALUE (OBD_PING); - - COMMENT ("Sizes and Offsets"); - BLANK_LINE (); - check_lustre_handle (); - check_lustre_msg (); - check_obdo (); - check_lov_mds_md_v1 (); - check_obd_statfs (); - check_obd_ioobj (); - check_niobuf_remote (); - check_ost_body (); - check_ll_fid (); - check_mds_status_req (); - check_mds_body (); - check_mds_rec_setattr (); - check_mds_rec_create (); - check_mds_rec_link (); - check_mds_rec_unlink (); - check_mds_rec_rename (); - check_lov_desc (); - check_ldlm_res_id (); - check_ldlm_extent (); - check_ldlm_flock (); - check_ldlm_intent (); - check_ldlm_resource_desc (); - check_ldlm_lock_desc (); - check_ldlm_request (); - check_ldlm_reply (); - check_ptlbd_op (); - check_ptlbd_niob (); - check_ptlbd_rsp (); - - printf ("}\n\n"); - - return (0); +main(int argc, char **argv) +{ + printf("void lustre_assert_wire_constants(void)\n" + "{\n"); + + COMMENT("Wire protocol assertions generated by 'wirecheck'"); + BLANK_LINE(); + + COMMENT("Constants..."); + CHECK_DEFINE(PTLRPC_MSG_MAGIC); + CHECK_DEFINE(PTLRPC_MSG_VERSION); + + CHECK_VALUE(PTL_RPC_MSG_REQUEST); + CHECK_VALUE(PTL_RPC_MSG_ERR); + CHECK_VALUE(PTL_RPC_MSG_REPLY); + + CHECK_VALUE(MSG_LAST_REPLAY); + CHECK_VALUE(MSG_RESENT); + + CHECK_VALUE(MSG_CONNECT_RECOVERING); + CHECK_VALUE(MSG_CONNECT_RECONNECT); + CHECK_VALUE(MSG_CONNECT_REPLAYABLE); + + CHECK_VALUE(OST_REPLY); + CHECK_VALUE(OST_GETATTR); + CHECK_VALUE(OST_SETATTR); + CHECK_VALUE(OST_READ); + CHECK_VALUE(OST_WRITE); + CHECK_VALUE(OST_CREATE); + CHECK_VALUE(OST_DESTROY); + CHECK_VALUE(OST_GET_INFO); + CHECK_VALUE(OST_CONNECT); + CHECK_VALUE(OST_DISCONNECT); + CHECK_VALUE(OST_PUNCH); + CHECK_VALUE(OST_OPEN); + CHECK_VALUE(OST_CLOSE); + CHECK_VALUE(OST_STATFS); + CHECK_VALUE(OST_SAN_READ); + CHECK_VALUE(OST_SAN_WRITE); + CHECK_VALUE(OST_SYNC); + CHECK_VALUE(OST_LAST_OPC); + CHECK_VALUE(OST_FIRST_OPC); + + CHECK_VALUE(OBD_FL_INLINEDATA); + CHECK_VALUE(OBD_FL_OBDMDEXISTS); + + CHECK_DEFINE(OBD_OBJECT_EOF); + + CHECK_VALUE(OST_REQ_HAS_OA1); + + CHECK_VALUE(MDS_GETATTR); + CHECK_VALUE(MDS_GETATTR_NAME); + CHECK_VALUE(MDS_CLOSE); + CHECK_VALUE(MDS_REINT); + CHECK_VALUE(MDS_READPAGE); + CHECK_VALUE(MDS_CONNECT); + CHECK_VALUE(MDS_DISCONNECT); + CHECK_VALUE(MDS_GETSTATUS); + CHECK_VALUE(MDS_STATFS); + CHECK_VALUE(MDS_LAST_OPC); + CHECK_VALUE(MDS_FIRST_OPC); + + CHECK_VALUE(REINT_SETATTR); + CHECK_VALUE(REINT_CREATE); + CHECK_VALUE(REINT_LINK); + CHECK_VALUE(REINT_UNLINK); + CHECK_VALUE(REINT_RENAME); + CHECK_VALUE(REINT_OPEN); + CHECK_VALUE(REINT_MAX); + + CHECK_VALUE(DISP_IT_EXECD); + CHECK_VALUE(DISP_LOOKUP_EXECD); + CHECK_VALUE(DISP_LOOKUP_NEG); + CHECK_VALUE(DISP_LOOKUP_POS); + CHECK_VALUE(DISP_OPEN_CREATE); + CHECK_VALUE(DISP_OPEN_OPEN); + + CHECK_VALUE(MDS_STATUS_CONN); + CHECK_VALUE(MDS_STATUS_LOV); + + CHECK_VALUE(MDS_OPEN_HAS_EA); + + CHECK_VALUE(LDLM_ENQUEUE); + CHECK_VALUE(LDLM_CONVERT); + CHECK_VALUE(LDLM_CANCEL); + CHECK_VALUE(LDLM_BL_CALLBACK); + CHECK_VALUE(LDLM_CP_CALLBACK); + CHECK_VALUE(LDLM_LAST_OPC); + CHECK_VALUE(LDLM_FIRST_OPC); + + CHECK_VALUE(PTLBD_QUERY); + CHECK_VALUE(PTLBD_READ); + CHECK_VALUE(PTLBD_WRITE); + CHECK_VALUE(PTLBD_FLUSH); + CHECK_VALUE(PTLBD_CONNECT); + CHECK_VALUE(PTLBD_DISCONNECT); + CHECK_VALUE(PTLBD_LAST_OPC); + CHECK_VALUE(PTLBD_FIRST_OPC); + + CHECK_VALUE(OBD_PING); + + COMMENT("Sizes and Offsets"); + BLANK_LINE(); + check_lustre_handle(); + check_lustre_msg(); + check_obdo(); + check_lov_mds_md_v1(); + check_obd_statfs(); + check_obd_ioobj(); + check_niobuf_remote(); + check_ost_body(); + check_ll_fid(); + check_mds_status_req(); + check_mds_body(); + check_mds_rec_setattr(); + check_mds_rec_create(); + check_mds_rec_link(); + check_mds_rec_unlink(); + check_mds_rec_rename(); + check_lov_desc(); + check_ldlm_res_id(); + check_ldlm_extent(); + check_ldlm_flock(); + check_ldlm_intent(); + check_ldlm_resource_desc(); + check_ldlm_lock_desc(); + check_ldlm_request(); + check_ldlm_reply(); + check_ptlbd_op(); + check_ptlbd_niob(); + check_ptlbd_rsp(); + check_llog_logid(); + check_llog_rec_hdr(); + check_llog_rec_tail(); + check_llog_log_hdr(); + check_llog_cookie(); + check_llogd_body(); + + printf("}\n\n"); + + return(0); } -- 1.8.3.1