LU-8127 lfsck: remove XATTR_NAME_LFSCK_NAMESPACE_OLD

We do not support the LFSCK compatibility between Lustre-2.9
and Lustre-2.6 any more. So drop related conditional compile
logic for XATTR_NAME_LFSCK_NAMESPACE_OLD.

Signed-off-by: Fan Yong <fan.yong@intel.com>
Change-Id: I3374ed357fc675b382fbb6703d0ba65c2d1420d9
Reviewed-on: http://review.whamcloud.com/20112
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Tested-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 2b9d6b9..be0fc4a 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -1603,10 +1603,6 @@ static inline void lmm_oi_cpu_to_le(struct ost_id *dst_oi,
 #define XATTR_NAME_LFSCK_BITMAP "trusted.lfsck_bitmap"
 #define XATTR_NAME_DUMMY       "trusted.dummy"
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
-# define XATTR_NAME_LFSCK_NAMESPACE_OLD "trusted.lfsck_namespace"
-#endif
-
 #define XATTR_NAME_LFSCK_NAMESPACE "trusted.lfsck_ns"
 #define XATTR_NAME_MAX_LEN     32 /* increase this, if there is longer name. */
 

diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c
index b938046..84872cf 100644 (file)
--- a/lustre/lfsck/lfsck_namespace.c
+++ b/lustre/lfsck/lfsck_namespace.c
@@ -327,12 +327,6 @@ static int lfsck_namespace_load_bitmap(const struct lu_env *env,
 /**
  * Load namespace LFSCK statistics information from the trace file.
  *
- * For old release (Lustre-2.6 or older), the statistics information was
- * stored as XATTR_NAME_LFSCK_NAMESPACE_OLD EA. But in Lustre-2.7, we need
- * more statistics information. To avoid confusing old MDT when downgrade,
- * Lustre-2.7 stores the namespace LFSCK statistics information as new
- * XATTR_NAME_LFSCK_NAMESPACE EA.
- *
  * \param[in] env      pointer to the thread context
  * \param[in] com      pointer to the lfsck component
  *
@@ -367,23 +361,13 @@ static int lfsck_namespace_load(const struct lu_env *env,
                       lfsck_lfsck2name(com->lc_lfsck), len, rc);
                if (rc >= 0)
                        rc = -ESTALE;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
-       } else {
-               /* Check whether it is old trace file or not.
-                * If yes, it should be reset via returning -ESTALE. */
-               rc = dt_xattr_get(env, com->lc_obj,
-                                 lfsck_buf_get(env, com->lc_file_disk, len),
-                                 XATTR_NAME_LFSCK_NAMESPACE_OLD);
-               if (rc >= 0)
-                       rc = -ESTALE;
-#endif
        }
 
        return rc;
 }
 
 static int lfsck_namespace_store(const struct lu_env *env,
-                                struct lfsck_component *com, bool init)
+                                struct lfsck_component *com)
 {
        struct dt_object                *obj    = com->lc_obj;
        struct lfsck_instance           *lfsck  = com->lc_lfsck;
@@ -395,9 +379,6 @@ static int lfsck_namespace_store(const struct lu_env *env,
        __u32                            nbits  = 0;
        int                              len    = com->lc_file_size;
        int                              rc;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
-       struct lu_buf            tbuf   = { &len, sizeof(len) };
-#endif
        ENTRY;
 
        if (lad != NULL) {
@@ -429,20 +410,6 @@ static int lfsck_namespace_store(const struct lu_env *env,
                        GOTO(out, rc);
        }
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
-       /* To be compatible with old Lustre-2.x MDT (x <= 6), generate dummy
-        * XATTR_NAME_LFSCK_NAMESPACE_OLD EA, then when downgrade to Lustre-2.x,
-        * the old LFSCK will find "invalid" XATTR_NAME_LFSCK_NAMESPACE_OLD EA,
-        * then reset the namespace LFSCK trace file. */
-       if (init) {
-               rc = dt_declare_xattr_set(env, obj, &tbuf,
-                                         XATTR_NAME_LFSCK_NAMESPACE_OLD,
-                                         LU_XATTR_CREATE, handle);
-               if (rc != 0)
-                       GOTO(out, rc);
-       }
-#endif
-
        rc = dt_trans_start_local(env, dev, handle);
        if (rc != 0)
                GOTO(out, rc);
@@ -455,13 +422,6 @@ static int lfsck_namespace_store(const struct lu_env *env,
                                  lfsck_buf_get(env, bitmap->data, nbits >> 3),
                                  XATTR_NAME_LFSCK_BITMAP, 0, handle);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
-       if (rc == 0 && init)
-               rc = dt_xattr_set(env, obj, &tbuf,
-                                 XATTR_NAME_LFSCK_NAMESPACE_OLD,
-                                 LU_XATTR_CREATE, handle);
-#endif
-
        GOTO(out, rc);
 
 out:
@@ -542,7 +502,7 @@ static int lfsck_namespace_init(const struct lu_env *env,
        ns->ln_magic = LFSCK_NAMESPACE_MAGIC;
        ns->ln_status = LS_INIT;
        down_write(&com->lc_sem);
-       rc = lfsck_namespace_store(env, com, true);
+       rc = lfsck_namespace_store(env, com);
        up_write(&com->lc_sem);
        if (rc == 0)
                rc = lfsck_namespace_load_sub_trace_files(env, com, true);
@@ -3783,7 +3743,7 @@ static int lfsck_namespace_reset(const struct lu_env *env,
        lad->lad_incomplete = 0;
        CFS_RESET_BITMAP(lad->lad_bitmap);
 
-       rc = lfsck_namespace_store(env, com, true);
+       rc = lfsck_namespace_store(env, com);
 
        GOTO(out, rc);
 
@@ -3928,7 +3888,7 @@ static int lfsck_namespace_checkpoint(const struct lu_env *env,
                com->lc_new_checked = 0;
        }
 
-       rc = lfsck_namespace_store(env, com, false);
+       rc = lfsck_namespace_store(env, com);
        up_write(&com->lc_sem);
 
 log:
@@ -4236,7 +4196,7 @@ static int lfsck_namespace_post(const struct lu_env *env,
                com->lc_new_checked = 0;
        }
 
-       rc = lfsck_namespace_store(env, com, false);
+       rc = lfsck_namespace_store(env, com);
        up_write(&com->lc_sem);
 
        CDEBUG(D_LFSCK, "%s: namespace LFSCK post done: rc = %d\n",
@@ -6114,7 +6074,7 @@ checkpoint:
                        ns->ln_time_last_checkpoint = cfs_time_current_sec();
                        ns->ln_objs_checked_phase2 += com->lc_new_checked;
                        com->lc_new_checked = 0;
-                       rc = lfsck_namespace_store(env, com, false);
+                       rc = lfsck_namespace_store(env, com);
                        up_write(&com->lc_sem);
                        if (rc != 0)
                                GOTO(put, rc);
@@ -6240,7 +6200,7 @@ static int lfsck_namespace_double_scan_result(const struct lu_env *env,
                ns->ln_status = LS_FAILED;
        }
 
-       rc = lfsck_namespace_store(env, com, false);
+       rc = lfsck_namespace_store(env, com);
        up_write(&com->lc_sem);
 
        return rc;

diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c
index 92411a5..2dfce43 100644 (file)
--- a/lustre/mdt/mdt_xattr.c
+++ b/lustre/mdt/mdt_xattr.c
@@ -428,11 +428,6 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
                    strcmp(xattr_name, XATTR_NAME_HSM) == 0 ||
                    strcmp(xattr_name, XATTR_NAME_LFSCK_NAMESPACE) == 0)
                        GOTO(out, rc = 0);
-
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
-               if (strcmp(xattr_name, XATTR_NAME_LFSCK_NAMESPACE_OLD) == 0)
-                       GOTO(out, rc = 0);
-#endif
        } else if ((valid & OBD_MD_FLXATTR) &&
                   (strcmp(xattr_name, XATTR_NAME_ACL_ACCESS) == 0 ||
                    strcmp(xattr_name, XATTR_NAME_ACL_DEFAULT) == 0)) {

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2174b5d..a78fc3a 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7056,7 +7056,7 @@ test_102n() { # LU-4101 mdt: protect internal xattrs
        # Get 'before' xattrs of $file1.
        getfattr --absolute-names --dump --match=- $file1 > $xattr0
 
-       for name in lov lma lmv link fid version som hsm lfsck_namespace; do
+       for name in lov lma lmv link fid version som hsm; do
                # Try to copy xattr from $file0 to $file1.
                value=$(getxattr $file0 trusted.$name 2> /dev/null)