* vim:expandtab:shiftwidth=8:tabstop=8:
*/
#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <liblustre.h>
#include <linux/lustre_lib.h>
#include <linux/lustre_idl.h>
#define CHECK_DEFINE(a) \
do { \
- printf(" LASSERT("#a" == "STRINGIFY(a)");\n"); \
+ printf(" LASSERTF("#a" == "STRINGIFY(a) \
+ ",\" found %%lld\\n\",\n " \
+ "(long long)"#a");\n"); \
} while(0)
#define CHECK_VALUE(a) \
do { \
- printf(" LASSERT("#a" == %d);\n", a); \
+ printf(" LASSERTF("#a \
+ " == %d, \" found %%lld\\n\",\n "\
+ "(long long)"#a");\n",a);\
} while(0)
#define CHECK_MEMBER_OFFSET(s,m) \
do { \
- CHECK_VALUE(offsetof(struct s, m)); \
+ CHECK_VALUE((int)offsetof(struct s, m)); \
} while(0)
#define CHECK_MEMBER_SIZEOF(s,m) \
CHECK_MEMBER(obdo, o_ctime);
CHECK_MEMBER(obdo, o_size);
CHECK_MEMBER(obdo, o_blocks);
- CHECK_MEMBER(obdo, o_rdev);
+ CHECK_MEMBER(obdo, o_grant);
CHECK_MEMBER(obdo, o_blksize);
CHECK_MEMBER(obdo, o_mode);
CHECK_MEMBER(obdo, o_uid);
CHECK_MEMBER(obdo, o_nlink);
CHECK_MEMBER(obdo, o_generation);
CHECK_MEMBER(obdo, o_valid);
- CHECK_MEMBER(obdo, o_obdflags);
+ CHECK_MEMBER(obdo, o_misc);
CHECK_MEMBER(obdo, o_easize);
+ CHECK_MEMBER(obdo, o_mds);
+ CHECK_MEMBER(obdo, o_mds);
+ CHECK_MEMBER(obdo, o_padding);
CHECK_MEMBER(obdo, o_inline);
CHECK_VALUE(OBD_MD_FLID);
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_FLOSCOPQ);
CHECK_VALUE(OBD_MD_FLCOOKIE);
CHECK_VALUE(OBD_MD_FLGROUP);
+
+ CHECK_VALUE(OBD_FL_INLINEDATA);
+ CHECK_VALUE(OBD_FL_OBDMDEXISTS);
+ CHECK_VALUE(OBD_FL_DELORPHAN);
+ CHECK_VALUE(OBD_FL_NORPC);
+ CHECK_VALUE(OBD_FL_IDONLY);
+ CHECK_VALUE(OBD_FL_RECREATE_OBJS);
}
void
CHECK_VALUE(OBD_BRW_READ);
CHECK_VALUE(OBD_BRW_WRITE);
- CHECK_VALUE(OBD_BRW_CREATE);
CHECK_VALUE(OBD_BRW_SYNC);
+ CHECK_VALUE(OBD_BRW_FROM_GRANT);
}
void
}
void
-check_ll_fid(void)
+check_lustre_stc(void)
{
BLANK_LINE();
- CHECK_STRUCT(ll_fid);
- CHECK_MEMBER(ll_fid, id);
- CHECK_MEMBER(ll_fid, generation);
- CHECK_MEMBER(ll_fid, f_type);
+ CHECK_STRUCT(lustre_stc);
+ CHECK_MEMBER(lustre_stc, u.e3s.l3s_ino);
+ CHECK_MEMBER(lustre_stc, u.e3s.l3s_gen);
+ CHECK_MEMBER(lustre_stc, u.e3s.l3s_type);
}
void
{
BLANK_LINE();
CHECK_STRUCT(mds_body);
- CHECK_MEMBER(mds_body, fid1);
- CHECK_MEMBER(mds_body, fid2);
+ CHECK_MEMBER(mds_body, id1);
+ CHECK_MEMBER(mds_body, id2);
CHECK_MEMBER(mds_body, handle);
CHECK_MEMBER(mds_body, size);
CHECK_MEMBER(mds_body, blocks);
CHECK_MEMBER(mds_body, io_epoch);
- 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, 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);
CHECK_VALUE(FMODE_READ);
CHECK_VALUE(FMODE_EXEC);
CHECK_VALUE(MDS_OPEN_CREAT);
CHECK_VALUE(MDS_OPEN_EXCL);
+ CHECK_VALUE(MDS_OPEN_TRUNC);
CHECK_VALUE(MDS_OPEN_APPEND);
CHECK_VALUE(MDS_OPEN_SYNC);
CHECK_VALUE(MDS_OPEN_DIRECTORY);
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_id);
CHECK_MEMBER(mds_rec_setattr, sa_mode);
CHECK_MEMBER(mds_rec_setattr, sa_uid);
CHECK_MEMBER(mds_rec_setattr, sa_gid);
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_padding);
+ CHECK_MEMBER(mds_rec_create, cr_id);
+ CHECK_MEMBER(mds_rec_create, cr_replayid);
CHECK_MEMBER(mds_rec_create, cr_time);
CHECK_MEMBER(mds_rec_create, cr_rdev);
- CHECK_MEMBER(mds_rec_create, cr_suppgid);
}
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_padding);
+ CHECK_MEMBER(mds_rec_link, lk_id1);
+ CHECK_MEMBER(mds_rec_link, lk_id2);
CHECK_MEMBER(mds_rec_link, lk_time);
}
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_id1);
+ CHECK_MEMBER(mds_rec_unlink, ul_id2);
CHECK_MEMBER(mds_rec_unlink, ul_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_padding);
+ CHECK_MEMBER(mds_rec_rename, rn_id1);
+ CHECK_MEMBER(mds_rec_rename, rn_id2);
CHECK_MEMBER(mds_rec_rename, rn_time);
}
CHECK_STRUCT(ldlm_extent);
CHECK_MEMBER(ldlm_extent, start);
CHECK_MEMBER(ldlm_extent, end);
+ CHECK_MEMBER(ldlm_extent, gid);
}
void
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);
+ CHECK_MEMBER(ldlm_flock, blocking_pid);
+ CHECK_MEMBER(ldlm_flock, blocking_export);
}
void
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_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
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_request, lock_desc);
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_lvb(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(ost_lvb);
+ CHECK_MEMBER(ost_lvb, lvb_size);
+ CHECK_MEMBER(ost_lvb, lvb_mtime);
+ CHECK_MEMBER(ost_lvb, lvb_atime);
+ CHECK_MEMBER(ost_lvb, lvb_ctime);
+ CHECK_MEMBER(ost_lvb, lvb_blocks);
+}
+
+void
check_ptlbd_op(void)
{
BLANK_LINE();
CHECK_VALUE(MDS_UNLINK_REC);
CHECK_VALUE(OBD_CFG_REC);
CHECK_VALUE(PTL_CFG_REC);
+ CHECK_VALUE(LLOG_GEN_REC);
CHECK_VALUE(LLOG_HDR_MAGIC);
CHECK_VALUE(LLOG_LOGID_MAGIC);
}
void
+check_llog_catid(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_catid);
+ CHECK_MEMBER(llog_catid, lci_logid);
+}
+
+void
check_llog_rec_hdr(void)
{
BLANK_LINE();
}
void
+check_llog_logid_rec(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_logid_rec);
+ CHECK_MEMBER(llog_logid_rec, lid_hdr);
+ CHECK_MEMBER(llog_logid_rec, lid_id);
+ CHECK_MEMBER(llog_logid_rec, lid_tail);
+}
+
+void
+check_llog_create_rec(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_create_rec);
+ CHECK_MEMBER(llog_create_rec, lcr_hdr);
+ CHECK_MEMBER(llog_create_rec, lcr_id);
+ CHECK_MEMBER(llog_create_rec, lcr_oid);
+ CHECK_MEMBER(llog_create_rec, lcr_ogen);
+}
+
+void
+check_llog_orphan_rec(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_orphan_rec);
+ CHECK_MEMBER(llog_orphan_rec, lor_hdr);
+ CHECK_MEMBER(llog_orphan_rec, lor_oid);
+ CHECK_MEMBER(llog_orphan_rec, lor_ogen);
+ CHECK_MEMBER(llog_orphan_rec, lor_tail);
+}
+
+void
+check_llog_unlink_rec(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_unlink_rec);
+ CHECK_MEMBER(llog_unlink_rec, lur_hdr);
+ CHECK_MEMBER(llog_unlink_rec, lur_oid);
+ CHECK_MEMBER(llog_unlink_rec, lur_ogen);
+ CHECK_MEMBER(llog_unlink_rec, lur_tail);
+}
+
+void
+check_llog_size_change_rec(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_size_change_rec);
+ CHECK_MEMBER(llog_size_change_rec, lsc_hdr);
+ CHECK_MEMBER(llog_size_change_rec, lsc_id);
+ CHECK_MEMBER(llog_size_change_rec, lsc_io_epoch);
+ CHECK_MEMBER(llog_size_change_rec, lsc_tail);
+}
+
+void
+check_llog_gen(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_gen);
+ CHECK_MEMBER(llog_gen, mnt_cnt);
+ CHECK_MEMBER(llog_gen, conn_cnt);
+}
+
+void
+check_llog_gen_rec(void)
+{
+ BLANK_LINE();
+ CHECK_STRUCT(llog_gen_rec);
+ CHECK_MEMBER(llog_gen_rec, lgr_hdr);
+ CHECK_MEMBER(llog_gen_rec, lgr_gen);
+ CHECK_MEMBER(llog_gen_rec, lgr_tail);
+}
+
+void
check_llog_log_hdr(void)
{
BLANK_LINE();
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);
}
CHECK_MEMBER(llogd_body, lgd_len);
CHECK_MEMBER(llogd_body, lgd_cur_offset);
- CHECK_VALUE(LLOG_ORIGIN_HANDLE_CREATE);
+ CHECK_VALUE(LLOG_ORIGIN_HANDLE_OPEN);
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);
-}
-
-void
-check_llog_ctxt_gen(void)
-{
- BLANK_LINE();
- CHECK_STRUCT(llog_ctxt_gen);
- CHECK_MEMBER(llog_ctxt_gen, mnt_cnt);
- CHECK_MEMBER(llog_ctxt_gen, conn_cnt);
+ CHECK_VALUE(LLOG_ORIGIN_CONNECT);
+ CHECK_VALUE(LLOG_CATINFO);
}
void
CHECK_MEMBER(llogd_conn_body, lgdc_ctxt_idx);
}
+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)
{
- printf("void lustre_assert_wire_constants(void)\n"
- "{\n");
+ char unameinfo[80];
+ char gccinfo[80];
- COMMENT("Wire protocol assertions generated by 'wirecheck'");
- BLANK_LINE();
+ system_string("uname -a", unameinfo, sizeof(unameinfo));
+ system_string("gcc -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo));
+
+ printf ("void lustre_assert_wire_constants(void)\n"
+ "{\n"
+ " /* Wire protocol assertions generated by 'wirecheck'\n"
+ " * running on %s\n"
+ " * with %s */\n"
+ "\n", unameinfo, gccinfo);
+
+ BLANK_LINE ();
COMMENT("Constants...");
CHECK_DEFINE(PTLRPC_MSG_MAGIC);
CHECK_VALUE(MSG_LAST_REPLAY);
CHECK_VALUE(MSG_RESENT);
+ CHECK_VALUE(MSG_REPLAY);
CHECK_VALUE(MSG_CONNECT_RECOVERING);
CHECK_VALUE(MSG_CONNECT_RECONNECT);
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_GETATTR_LOCK);
CHECK_VALUE(MDS_CLOSE);
CHECK_VALUE(MDS_REINT);
CHECK_VALUE(MDS_READPAGE);
CHECK_VALUE(MDS_DISCONNECT);
CHECK_VALUE(MDS_GETSTATUS);
CHECK_VALUE(MDS_STATFS);
+ CHECK_VALUE(MDS_PIN);
+ CHECK_VALUE(MDS_UNPIN);
+ CHECK_VALUE(MDS_SYNC);
+ CHECK_VALUE(MDS_DONE_WRITING);
CHECK_VALUE(MDS_LAST_OPC);
- CHECK_VALUE(MDS_FIRST_OPC);
CHECK_VALUE(REINT_SETATTR);
CHECK_VALUE(REINT_CREATE);
CHECK_VALUE(LDLM_BL_CALLBACK);
CHECK_VALUE(LDLM_CP_CALLBACK);
CHECK_VALUE(LDLM_LAST_OPC);
- CHECK_VALUE(LDLM_FIRST_OPC);
+
+ CHECK_VALUE(LCK_EX);
+ CHECK_VALUE(LCK_PW);
+ CHECK_VALUE(LCK_PR);
+ CHECK_VALUE(LCK_CW);
+ CHECK_VALUE(LCK_CR);
+ CHECK_VALUE(LCK_NL);
CHECK_VALUE(PTLBD_QUERY);
CHECK_VALUE(PTLBD_READ);
CHECK_VALUE(PTLBD_CONNECT);
CHECK_VALUE(PTLBD_DISCONNECT);
CHECK_VALUE(PTLBD_LAST_OPC);
- CHECK_VALUE(PTLBD_FIRST_OPC);
+
+ CHECK_VALUE(MGMT_CONNECT);
+ CHECK_VALUE(MGMT_DISCONNECT);
+ CHECK_VALUE(MGMT_EXCEPTION);
CHECK_VALUE(OBD_PING);
+ CHECK_VALUE(OBD_LOG_CANCEL);
+ CHECK_VALUE(OBD_LAST_OPC);
COMMENT("Sizes and Offsets");
BLANK_LINE();
check_obd_ioobj();
check_niobuf_remote();
check_ost_body();
- check_ll_fid();
+ check_lustre_stc();
check_mds_status_req();
check_mds_body();
check_mds_rec_setattr();
check_ldlm_lock_desc();
check_ldlm_request();
check_ldlm_reply();
+ check_ldlm_lvb();
check_ptlbd_op();
check_ptlbd_niob();
check_ptlbd_rsp();
check_llog_logid();
+ check_llog_catid();
check_llog_rec_hdr();
check_llog_rec_tail();
+ check_llog_logid_rec();
+ check_llog_create_rec();
+ check_llog_orphan_rec();
+ check_llog_unlink_rec();
+ check_llog_size_change_rec();
+ check_llog_gen();
+ check_llog_gen_rec();
check_llog_log_hdr();
check_llog_cookie();
check_llogd_body();
git://git.whamcloud.com / fs / lustre-release.git / blobdiff