From: Andreas Dilger Date: Wed, 6 Jun 2018 22:21:51 +0000 (-0600) Subject: LU-10855 ptlrpc: remove obsolete LLOG_ORIGIN_* RPCs X-Git-Tag: 2.11.53~11 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=830ce1b10f3a5d3536e5ec0a9ef87fe739a509a2 LU-10855 ptlrpc: remove obsolete LLOG_ORIGIN_* RPCs Remove the obsolete RPC opcodes LLOG_ORIGIN_HANDLE_WRITE_REC, LLOG_ORIGIN_HANDLE_CLOSE, LLOG_ORIGIN_CONNECT, LLOG_CATINFO along with their unused OBD_FAIL counterparts. Test-Parameters: trivial Signed-off-by: Andreas Dilger Change-Id: I5a2a15bc0dc9e09d0081b6c3aa291fc7713ebbe5 Reviewed-on: https://review.whamcloud.com/32654 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index cc9ec19..5ff7fbf 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -512,15 +512,15 @@ extern char obd_jobid_var[]; #define OBD_FAIL_SEC_CTX_HDL_PAUSE 0x1204 #define OBD_FAIL_LLOG 0x1300 -#define OBD_FAIL_LLOG_ORIGIN_CONNECT_NET 0x1301 +/* was OBD_FAIL_LLOG_ORIGIN_CONNECT_NET 0x1301 until 2.4 */ #define OBD_FAIL_LLOG_ORIGIN_HANDLE_CREATE_NET 0x1302 -#define OBD_FAIL_LLOG_ORIGIN_HANDLE_DESTROY_NET 0x1303 +/* was OBD_FAIL_LLOG_ORIGIN_HANDLE_DESTROY_NET 0x1303 until 2.11 */ #define OBD_FAIL_LLOG_ORIGIN_HANDLE_READ_HEADER_NET 0x1304 #define OBD_FAIL_LLOG_ORIGIN_HANDLE_NEXT_BLOCK_NET 0x1305 #define OBD_FAIL_LLOG_ORIGIN_HANDLE_PREV_BLOCK_NET 0x1306 -#define OBD_FAIL_LLOG_ORIGIN_HANDLE_WRITE_REC_NET 0x1307 -#define OBD_FAIL_LLOG_ORIGIN_HANDLE_CLOSE_NET 0x1308 -#define OBD_FAIL_LLOG_CATINFO_NET 0x1309 +/* was OBD_FAIL_LLOG_ORIGIN_HANDLE_WRITE_REC_NET 0x1307 until 2.1 */ +/* was OBD_FAIL_LLOG_ORIGIN_HANDLE_CLOSE_NET 0x1308 until 1.8 */ +/* was OBD_FAIL_LLOG_CATINFO_NET 0x1309 until 2.3 */ #define OBD_FAIL_MDS_SYNC_CAPA_SL 0x1310 #define OBD_FAIL_SEQ_ALLOC 0x1311 #define OBD_FAIL_CAT_RECORDS 0x1312 diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h index 84b913b..4351ee2 100644 --- a/lustre/include/uapi/linux/lustre/lustre_idl.h +++ b/lustre/include/uapi/linux/lustre/lustre_idl.h @@ -2906,12 +2906,12 @@ enum llogd_rpc_ops { LLOG_ORIGIN_HANDLE_CREATE = 501, LLOG_ORIGIN_HANDLE_NEXT_BLOCK = 502, LLOG_ORIGIN_HANDLE_READ_HEADER = 503, - LLOG_ORIGIN_HANDLE_WRITE_REC = 504, /* Obsolete by 2.1. */ - LLOG_ORIGIN_HANDLE_CLOSE = 505, /* Obsolete by 1.8. */ - LLOG_ORIGIN_CONNECT = 506, /* Obsolete by 2.4. */ - LLOG_CATINFO = 507, /* Obsolete by 2.3. */ +/* LLOG_ORIGIN_HANDLE_WRITE_REC = 504, Obsolete by 2.1. */ +/* LLOG_ORIGIN_HANDLE_CLOSE = 505, Obsolete by 1.8. */ +/* LLOG_ORIGIN_CONNECT = 506, Obsolete by 2.4. */ +/* LLOG_CATINFO = 507, Obsolete by 2.3. */ LLOG_ORIGIN_HANDLE_PREV_BLOCK = 508, - LLOG_ORIGIN_HANDLE_DESTROY = 509, /* Obsolete. */ + LLOG_ORIGIN_HANDLE_DESTROY = 509, /* Obsolete by 2.11. */ LLOG_LAST_OPC, LLOG_FIRST_OPC = LLOG_ORIGIN_HANDLE_CREATE }; diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c index dac0942..8d081e2 100644 --- a/lustre/ptlrpc/lproc_ptlrpc.c +++ b/lustre/ptlrpc/lproc_ptlrpc.c @@ -116,10 +116,10 @@ static struct ll_rpc_opcode { { LLOG_ORIGIN_HANDLE_CREATE, "llog_origin_handle_open" }, { LLOG_ORIGIN_HANDLE_NEXT_BLOCK, "llog_origin_handle_next_block" }, { LLOG_ORIGIN_HANDLE_READ_HEADER,"llog_origin_handle_read_header" }, - { LLOG_ORIGIN_HANDLE_WRITE_REC, "llog_origin_handle_write_rec" }, - { LLOG_ORIGIN_HANDLE_CLOSE, "llog_origin_handle_close" }, - { LLOG_ORIGIN_CONNECT, "llog_origin_connect" }, - { LLOG_CATINFO, "llog_catinfo" }, + { 504, /*LLOG_ORIGIN_HANDLE_WRITE_REC*/"llog_origin_handle_write_rec" }, + { 505, /* was LLOG_ORIGIN_HANDLE_CLOSE */ "llog_origin_handle_close" }, + { 506, /* was LLOG_ORIGIN_CONNECT */ "llog_origin_connect" }, + { 507, /* was LLOG_CATINFO */ "llog_catinfo" }, { LLOG_ORIGIN_HANDLE_PREV_BLOCK, "llog_origin_handle_prev_block" }, { LLOG_ORIGIN_HANDLE_DESTROY, "llog_origin_handle_destroy" }, { QUOTA_DQACQ, "quota_acquire" }, diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 30ad1e4..dc5f751 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -4171,12 +4171,7 @@ void lustre_assert_wire_constants(void) CLASSERT(LLOG_ORIGIN_HANDLE_CREATE == 501); CLASSERT(LLOG_ORIGIN_HANDLE_NEXT_BLOCK == 502); CLASSERT(LLOG_ORIGIN_HANDLE_READ_HEADER == 503); - CLASSERT(LLOG_ORIGIN_HANDLE_WRITE_REC == 504); - CLASSERT(LLOG_ORIGIN_HANDLE_CLOSE == 505); - CLASSERT(LLOG_ORIGIN_CONNECT == 506); - CLASSERT(LLOG_CATINFO == 507); CLASSERT(LLOG_ORIGIN_HANDLE_PREV_BLOCK == 508); - CLASSERT(LLOG_ORIGIN_HANDLE_DESTROY == 509); CLASSERT(LLOG_FIRST_OPC == 501); CLASSERT(LLOG_LAST_OPC == 510); CLASSERT(LLOG_CONFIG_ORIG_CTXT == 0); diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 4211cef..da7ad1f 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -1848,12 +1848,7 @@ check_llogd_body(void) CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CREATE); CHECK_CVALUE(LLOG_ORIGIN_HANDLE_NEXT_BLOCK); CHECK_CVALUE(LLOG_ORIGIN_HANDLE_READ_HEADER); - CHECK_CVALUE(LLOG_ORIGIN_HANDLE_WRITE_REC); - CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CLOSE); - CHECK_CVALUE(LLOG_ORIGIN_CONNECT); - CHECK_CVALUE(LLOG_CATINFO); CHECK_CVALUE(LLOG_ORIGIN_HANDLE_PREV_BLOCK); - CHECK_CVALUE(LLOG_ORIGIN_HANDLE_DESTROY); CHECK_CVALUE(LLOG_FIRST_OPC); CHECK_CVALUE(LLOG_LAST_OPC); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 0ff5bbd..795ca7e 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -4192,12 +4192,7 @@ void lustre_assert_wire_constants(void) CLASSERT(LLOG_ORIGIN_HANDLE_CREATE == 501); CLASSERT(LLOG_ORIGIN_HANDLE_NEXT_BLOCK == 502); CLASSERT(LLOG_ORIGIN_HANDLE_READ_HEADER == 503); - CLASSERT(LLOG_ORIGIN_HANDLE_WRITE_REC == 504); - CLASSERT(LLOG_ORIGIN_HANDLE_CLOSE == 505); - CLASSERT(LLOG_ORIGIN_CONNECT == 506); - CLASSERT(LLOG_CATINFO == 507); CLASSERT(LLOG_ORIGIN_HANDLE_PREV_BLOCK == 508); - CLASSERT(LLOG_ORIGIN_HANDLE_DESTROY == 509); CLASSERT(LLOG_FIRST_OPC == 501); CLASSERT(LLOG_LAST_OPC == 510); CLASSERT(LLOG_CONFIG_ORIG_CTXT == 0);