From 11eba11fe0457b735194e5924e7bb1882a5b31b8 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Fri, 30 Aug 2019 09:39:57 -0400 Subject: [PATCH] LU-11213 uapi: Remove unused CONNECT flag The plain layout connect flag was added as part of an earlier implementation of LU-11213, but the design was improved before landing and the flag was not needed. Let's remove it. Since it was never actually marked as supported in any client/server version, we can just remove it entirely, leaving the flag bit open for future use. Signed-off-by: Patrick Farrell Change-Id: I30946a50299268d00cbfee2081607effd0e4fb47 Reviewed-on: https://review.whamcloud.com/36008 Reviewed-by: Shilong Wang Tested-by: jenkins Reviewed-by: Lai Siyao Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/include/uapi/linux/lustre/lustre_idl.h | 1 - lustre/ptlrpc/wiretest.c | 2 -- lustre/utils/wirecheck.c | 1 - lustre/utils/wiretest.c | 2 -- 4 files changed, 6 deletions(-) diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h index 515b081..372d0de 100644 --- a/lustre/include/uapi/linux/lustre/lustre_idl.h +++ b/lustre/include/uapi/linux/lustre/lustre_idl.h @@ -838,7 +838,6 @@ struct ptlrpc_body_v2 { #define OBD_CONNECT2_SELINUX_POLICY 0x400ULL /* has client SELinux policy */ #define OBD_CONNECT2_LSOM 0x800ULL /* LSOM support */ #define OBD_CONNECT2_PCC 0x1000ULL /* Persistent Client Cache */ -#define OBD_CONNECT2_PLAIN_LAYOUT 0x2000ULL /* Plain Directory Layout */ #define OBD_CONNECT2_ASYNC_DISCARD 0x4000ULL /* support async DoM data discard */ /* XXX README XXX: diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index c7f1681..87b1407 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -1351,8 +1351,6 @@ void lustre_assert_wire_constants(void) OBD_CONNECT2_LSOM); LASSERTF(OBD_CONNECT2_PCC == 0x1000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_PCC); - LASSERTF(OBD_CONNECT2_PLAIN_LAYOUT == 0x2000ULL, "found 0x%.16llxULL\n", - OBD_CONNECT2_PLAIN_LAYOUT); LASSERTF(OBD_CONNECT2_ASYNC_DISCARD == 0x4000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_ASYNC_DISCARD); LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 72eca34..5de1fbc 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -610,7 +610,6 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT2_SELINUX_POLICY); CHECK_DEFINE_64X(OBD_CONNECT2_LSOM); CHECK_DEFINE_64X(OBD_CONNECT2_PCC); - CHECK_DEFINE_64X(OBD_CONNECT2_PLAIN_LAYOUT); CHECK_DEFINE_64X(OBD_CONNECT2_ASYNC_DISCARD); CHECK_VALUE_X(OBD_CKSUM_CRC32); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index f9e76c2..3cc6c32 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -1372,8 +1372,6 @@ void lustre_assert_wire_constants(void) OBD_CONNECT2_LSOM); LASSERTF(OBD_CONNECT2_PCC == 0x1000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_PCC); - LASSERTF(OBD_CONNECT2_PLAIN_LAYOUT == 0x2000ULL, "found 0x%.16llxULL\n", - OBD_CONNECT2_PLAIN_LAYOUT); LASSERTF(OBD_CONNECT2_ASYNC_DISCARD == 0x4000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_ASYNC_DISCARD); LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", -- 1.8.3.1