Details
-
Bug
-
Resolution: Fixed
-
Major
-
None
-
None
-
3
-
9223372036854775807
Description
I was trying to generate wiretest.c for my changes and noticed unexpected strings in diff. This stings are generated even on clean master.
diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 3056a0bb7c..2fa38ed51a 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -175,8 +175,6 @@ void lustre_assert_wire_constants(void) (long long)MDS_HSM_CT_UNREGISTER); LASSERTF(MDS_SWAP_LAYOUTS == 61, "found %lld\n", (long long)MDS_SWAP_LAYOUTS); - LASSERTF(MDS_RMFID == 62, "found %lld\n", - (long long)MDS_RMFID); LASSERTF(MDS_LAST_OPC == 63, "found %lld\n", (long long)MDS_LAST_OPC); LASSERTF(REINT_SETATTR == 1, "found %lld\n", @@ -1343,8 +1341,6 @@ void lustre_assert_wire_constants(void) OBD_CONNECT2_LOCK_CONVERT); LASSERTF(OBD_CONNECT2_ARCHIVE_ID_ARRAY == 0x100ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_ARCHIVE_ID_ARRAY); - LASSERTF(OBD_CONNECT2_INC_XID == 0x200ULL, "found 0x%.16llxULL\n", - OBD_CONNECT2_INC_XID); LASSERTF(OBD_CONNECT2_SELINUX_POLICY == 0x400ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_SELINUX_POLICY); LASSERTF(OBD_CONNECT2_LSOM == 0x800ULL, "found 0x%.16llxULL\n", @@ -1948,20 +1944,6 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct obd_statfs, os_spare9)); LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare9) == 4, "found %lld\n", (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare9)); - LASSERTF(OS_STATE_DEGRADED == 0x1, "found %lld\n", - (long long)OS_STATE_DEGRADED); - LASSERTF(OS_STATE_READONLY == 0x2, "found %lld\n", - (long long)OS_STATE_READONLY); - LASSERTF(OS_STATE_NOPRECREATE == 0x4, "found %lld\n", - (long long)OS_STATE_NOPRECREATE); - LASSERTF(OS_STATE_ENOSPC == 0x20, "found %lld\n", - (long long)OS_STATE_ENOSPC); - LASSERTF(OS_STATE_ENOINO == 0x40, "found %lld\n", - (long long)OS_STATE_ENOINO); - LASSERTF(OS_STATE_SUM == 0x100, "found %lld\n", - (long long)OS_STATE_SUM); - LASSERTF(OS_STATE_NONROT == 0x200, "found %lld\n", - (long long)OS_STATE_NONROT); /* Checks for struct obd_ioobj */ LASSERTF((int)sizeof(struct obd_ioobj) == 24, "found %lld\n", @@ -2518,19 +2500,19 @@ void lustre_assert_wire_constants(void) (unsigned)LUSTRE_DIRECTIO_FL); LASSERTF(LUSTRE_INLINE_DATA_FL == 0x10000000UL, "found 0x%.8xUL\n", (unsigned)LUSTRE_INLINE_DATA_FL); - LASSERTF(MDS_INODELOCK_LOOKUP == 0x000001, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_LOOKUP == MDS_INODELOCK_LOOKUP, "found 0x%.8x\n", MDS_INODELOCK_LOOKUP); - LASSERTF(MDS_INODELOCK_UPDATE == 0x000002, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_UPDATE == MDS_INODELOCK_UPDATE, "found 0x%.8x\n", MDS_INODELOCK_UPDATE); - LASSERTF(MDS_INODELOCK_OPEN == 0x000004, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_OPEN == MDS_INODELOCK_OPEN, "found 0x%.8x\n", MDS_INODELOCK_OPEN); - LASSERTF(MDS_INODELOCK_LAYOUT == 0x000008, "found 0x%.8x\n", MDS_INODELOCK_LAYOUT); - LASSERTF(MDS_INODELOCK_PERM == 0x000010, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_PERM == MDS_INODELOCK_PERM, "found 0x%.8x\n", MDS_INODELOCK_PERM); - LASSERTF(MDS_INODELOCK_XATTR == 0x000020, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_XATTR == MDS_INODELOCK_XATTR, "found 0x%.8x\n", MDS_INODELOCK_XATTR); - LASSERTF(MDS_INODELOCK_DOM == 0x000040, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_DOM == MDS_INODELOCK_DOM, "found 0x%.8x\n", MDS_INODELOCK_DOM); /* Checks for struct mdt_ioepoch */ @@ -4629,7 +4611,7 @@ void lustre_assert_wire_constants(void) CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000); CLASSERT(FIEMAP_EXTENT_NET == 0x80000000); -#ifdef CONFIG_LUSTRE_FS_POSIX_ACL +#ifdef CONFIG_FS_POSIX_ACL /* Checks for type posix_acl_xattr_entry */ LASSERTF((int)sizeof(posix_acl_xattr_entry) == 8, "found %lld\n", (long long)(int)sizeof(posix_acl_xattr_entry)); @@ -4645,9 +4627,9 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(posix_acl_xattr_entry, e_id)); LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_id) == 4, "found %lld\n", (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_id)); -#endif /* CONFIG_LUSTRE_FS_POSIX_ACL */ +#endif /* CONFIG_FS_POSIX_ACL */ -#ifdef CONFIG_LUSTRE_FS_POSIX_ACL +#ifdef CONFIG_FS_POSIX_ACL /* Checks for type posix_acl_xattr_header */ LASSERTF((int)sizeof(posix_acl_xattr_header) == 4, "found %lld\n", (long long)(int)sizeof(posix_acl_xattr_header)); @@ -4661,7 +4643,7 @@ void lustre_assert_wire_constants(void) LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_entries) == 0, "found %lld\n", (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_entries)); #endif /* HAVE_STRUCT_POSIX_ACL_XATTR */ -#endif /* CONFIG_LUSTRE_FS_POSIX_ACL */ +#endif /* CONFIG_FS_POSIX_ACL */ /* Checks for struct link_ea_header */ LASSERTF((int)sizeof(struct link_ea_header) == 24, "found %lld\n", diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 68b6691e31..ac79a96062 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -196,8 +196,6 @@ void lustre_assert_wire_constants(void) (long long)MDS_HSM_CT_UNREGISTER); LASSERTF(MDS_SWAP_LAYOUTS == 61, "found %lld\n", (long long)MDS_SWAP_LAYOUTS); - LASSERTF(MDS_RMFID == 62, "found %lld\n", - (long long)MDS_RMFID); LASSERTF(MDS_LAST_OPC == 63, "found %lld\n", (long long)MDS_LAST_OPC); LASSERTF(REINT_SETATTR == 1, "found %lld\n", @@ -1364,8 +1362,6 @@ void lustre_assert_wire_constants(void) OBD_CONNECT2_LOCK_CONVERT); LASSERTF(OBD_CONNECT2_ARCHIVE_ID_ARRAY == 0x100ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_ARCHIVE_ID_ARRAY); - LASSERTF(OBD_CONNECT2_INC_XID == 0x200ULL, "found 0x%.16llxULL\n", - OBD_CONNECT2_INC_XID); LASSERTF(OBD_CONNECT2_SELINUX_POLICY == 0x400ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_SELINUX_POLICY); LASSERTF(OBD_CONNECT2_LSOM == 0x800ULL, "found 0x%.16llxULL\n", @@ -2525,19 +2521,19 @@ void lustre_assert_wire_constants(void) (unsigned)LUSTRE_DIRECTIO_FL); LASSERTF(LUSTRE_INLINE_DATA_FL == 0x10000000UL, "found 0x%.8xUL\n", (unsigned)LUSTRE_INLINE_DATA_FL); - LASSERTF(MDS_INODELOCK_LOOKUP == 0x000001, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_LOOKUP == MDS_INODELOCK_LOOKUP, "found 0x%.8x\n", MDS_INODELOCK_LOOKUP); - LASSERTF(MDS_INODELOCK_UPDATE == 0x000002, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_UPDATE == MDS_INODELOCK_UPDATE, "found 0x%.8x\n", MDS_INODELOCK_UPDATE); - LASSERTF(MDS_INODELOCK_OPEN == 0x000004, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_OPEN == MDS_INODELOCK_OPEN, "found 0x%.8x\n", MDS_INODELOCK_OPEN); - LASSERTF(MDS_INODELOCK_LAYOUT == 0x000008, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_LAYOUT == MDS_INODELOCK_LAYOUT, "found 0x%.8x\n", MDS_INODELOCK_LAYOUT); - LASSERTF(MDS_INODELOCK_PERM == 0x000010, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_PERM == MDS_INODELOCK_PERM, "found 0x%.8x\n", MDS_INODELOCK_PERM); - LASSERTF(MDS_INODELOCK_XATTR == 0x000020, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_XATTR == MDS_INODELOCK_XATTR, "found 0x%.8x\n", MDS_INODELOCK_XATTR); - LASSERTF(MDS_INODELOCK_DOM == 0x000040, "found 0x%.8x\n", + LASSERTF(MDS_INODELOCK_DOM == MDS_INODELOCK_DOM, "found 0x%.8x\n", MDS_INODELOCK_DOM); /* Checks for struct mdt_ioepoch */
I expect make newwiretest should not change anything if requests-related code is not changed.