LU-1187 idl: remove obsolete directory split flags

The directory split functionality from the old CMD (pre-DNE)
feature was never usable in production, and was removed before
the DNE 2.4 release.  Remove old flags relating to this feature.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: I052ea57843ae67c18706a80221590924077bf46f
Reviewed-on: https://review.whamcloud.com/31700
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index 2803aa0..357fb14 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -1216,7 +1216,7 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
 /*     OBD_MD_FLRMTPERM     (0x0000010000000000ULL) remote perm, obsolete */
 #define OBD_MD_FLMDSCAPA     (0x0000020000000000ULL) /* MDS capability */
 #define OBD_MD_FLOSSCAPA     (0x0000040000000000ULL) /* OSS capability */
-#define OBD_MD_FLCKSPLIT     (0x0000080000000000ULL) /* Check split on server */
+/*      OBD_MD_FLCKSPLIT     (0x0000080000000000ULL) obsolete 2.3.58*/
 #define OBD_MD_FLCROSSREF    (0x0000100000000000ULL) /* Cross-ref case */
 #define OBD_MD_FLGETATTRLOCK (0x0000200000000000ULL) /* Get IOEpoch attributes
                                                       * under lock; for xattr
@@ -1829,7 +1829,7 @@ struct mdt_rec_setattr {
 #define MDS_ATTR_PROJID            0x10000ULL  /* = 65536 */
 
 enum mds_op_bias {
-       MDS_CHECK_SPLIT         = 1 << 0,
+/*     MDS_CHECK_SPLIT         = 1 << 0, obsolete before 2.3.58 */
        MDS_CROSS_REF           = 1 << 1,
        MDS_VTX_BYPASS          = 1 << 2,
        MDS_PERM_BYPASS         = 1 << 3,

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 8802172..7a50d4a 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -527,8 +527,6 @@ void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, __u32 flags,
                                                     &RMF_MDT_BODY);
 
        b->mbo_valid = valid;
-       if (op_data->op_bias & MDS_CHECK_SPLIT)
-               b->mbo_valid |= OBD_MD_FLCKSPLIT;
        if (op_data->op_bias & MDS_CROSS_REF)
                b->mbo_valid |= OBD_MD_FLCROSSREF;
        b->mbo_eadatasize = ea_size;

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 0ce53d0..a2f34a7 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -1528,8 +1528,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLMDSCAPA);
        LASSERTF(OBD_MD_FLOSSCAPA == (0x0000040000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLOSSCAPA);
-       LASSERTF(OBD_MD_FLCKSPLIT == (0x0000080000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLCKSPLIT);
        LASSERTF(OBD_MD_FLCROSSREF == (0x0000100000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCROSSREF);
        LASSERTF(OBD_MD_FLGETATTRLOCK == (0x0000200000000000ULL), "found 0x%.16llxULL\n",
@@ -2199,8 +2197,6 @@ void lustre_assert_wire_constants(void)
        LASSERTF((int)sizeof(((struct ll_fid *)0)->f_type) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct ll_fid *)0)->f_type));
 
-       LASSERTF(MDS_CHECK_SPLIT == 0x00000001UL, "found 0x%.8xUL\n",
-               (unsigned)MDS_CHECK_SPLIT);
        LASSERTF(MDS_CROSS_REF == 0x00000002UL, "found 0x%.8xUL\n",
                (unsigned)MDS_CROSS_REF);
        LASSERTF(MDS_VTX_BYPASS == 0x00000004UL, "found 0x%.8xUL\n",

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 9b0e15c..8a8fe99 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -679,7 +679,6 @@ check_obdo(void)
        CHECK_DEFINE_64X(OBD_MD_FLACL);
        CHECK_DEFINE_64X(OBD_MD_FLMDSCAPA);
        CHECK_DEFINE_64X(OBD_MD_FLOSSCAPA);
-       CHECK_DEFINE_64X(OBD_MD_FLCKSPLIT);
        CHECK_DEFINE_64X(OBD_MD_FLCROSSREF);
        CHECK_DEFINE_64X(OBD_MD_FLGETATTRLOCK);
        CHECK_DEFINE_64X(OBD_MD_FLDATAVERSION);
@@ -1009,7 +1008,6 @@ static void
 check_mds_op_bias(void)
 {
        BLANK_LINE();
-       CHECK_VALUE_X(MDS_CHECK_SPLIT);
        CHECK_VALUE_X(MDS_CROSS_REF);
        CHECK_VALUE_X(MDS_VTX_BYPASS);
        CHECK_VALUE_X(MDS_PERM_BYPASS);

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 59b1516..9a13d9a 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -1549,8 +1549,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLMDSCAPA);
        LASSERTF(OBD_MD_FLOSSCAPA == (0x0000040000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLOSSCAPA);
-       LASSERTF(OBD_MD_FLCKSPLIT == (0x0000080000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLCKSPLIT);
        LASSERTF(OBD_MD_FLCROSSREF == (0x0000100000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCROSSREF);
        LASSERTF(OBD_MD_FLGETATTRLOCK == (0x0000200000000000ULL), "found 0x%.16llxULL\n",
@@ -2220,8 +2218,6 @@ void lustre_assert_wire_constants(void)
        LASSERTF((int)sizeof(((struct ll_fid *)0)->f_type) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct ll_fid *)0)->f_type));
 
-       LASSERTF(MDS_CHECK_SPLIT == 0x00000001UL, "found 0x%.8xUL\n",
-               (unsigned)MDS_CHECK_SPLIT);
        LASSERTF(MDS_CROSS_REF == 0x00000002UL, "found 0x%.8xUL\n",
                (unsigned)MDS_CROSS_REF);
        LASSERTF(MDS_VTX_BYPASS == 0x00000004UL, "found 0x%.8xUL\n",