New tag 2.7.54

Change-Id: I43dc353a8463eae5a2cc0d21c335e8fb74a9d575

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index f9ea770..d634049 100644 (file)
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,6 +1,6 @@
 m4_define([LUSTRE_MAJOR],[2])
 m4_define([LUSTRE_MINOR],[7])
-m4_define([LUSTRE_PATCH],[52])
+m4_define([LUSTRE_PATCH],[54])
 m4_define([LUSTRE_FIX],[0])
 
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but

diff --git a/lustre/osd-ldiskfs/osd_quota.c b/lustre/osd-ldiskfs/osd_quota.c
index 174fe37..1c1b8f5 100644 (file)
--- a/lustre/osd-ldiskfs/osd_quota.c
+++ b/lustre/osd-ldiskfs/osd_quota.c
@@ -627,7 +627,7 @@ int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid,
        RETURN(rcu ? rcu : rcg);
 }
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 56, 0)
 /* Following code is used to migrate old admin quota files (in Linux quota
  * file v2 format) into the new quota global indexes (in IAM format). */
 

diff --git a/lustre/osd-ldiskfs/osd_quota_fmt.c b/lustre/osd-ldiskfs/osd_quota_fmt.c
index 482f817..3d94332 100644 (file)
--- a/lustre/osd-ldiskfs/osd_quota_fmt.c
+++ b/lustre/osd-ldiskfs/osd_quota_fmt.c
@@ -65,7 +65,7 @@ static ssize_t quota_read_blk(const struct lu_env *env,
 
        memset(buf, 0, LUSTRE_DQBLKSIZE);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 56, 0)
        /* type is set as -1 when reading old admin quota file */
        if (type != USRQUOTA && type != GRPQUOTA) {
                struct lu_buf   lu_buffer;

diff --git a/lustre/quota/lquota_disk.c b/lustre/quota/lquota_disk.c
index 9903d3a..ee41673 100644 (file)
--- a/lustre/quota/lquota_disk.c
+++ b/lustre/quota/lquota_disk.c
@@ -244,7 +244,7 @@ struct dt_object *lquota_disk_glb_find_create(const struct lu_env *env,
        CDEBUG(D_QUOTA, "look-up/create %sglobal idx file ("DFID")\n",
               local ? "local " : "", PFID(fid));
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 56, 0)
        /* we use different index feature for each quota type and target type
         * for the time being. This is done for on-disk conversion from the old
         * quota format. Once this is no longer required, we should just be

diff --git a/lustre/quota/lquota_lib.c b/lustre/quota/lquota_lib.c
index 33cd13a..1051d27 100644 (file)
--- a/lustre/quota/lquota_lib.c
+++ b/lustre/quota/lquota_lib.c
@@ -289,7 +289,7 @@ int lquota_extract_fid(const struct lu_fid *fid, int *pool_id, int *pool_type,
        RETURN(0);
 }
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 56, 0)
 /* Index features supported by the global index objects.
  * We actually use one dt_index_features structure for each quota combination
  * of quota type x [inode, block] to allow the ldiskfs OSD to recognize those
@@ -328,7 +328,7 @@ const struct dt_index_features *glb_idx_feature(struct lu_fid *fid)
                        return &dt_quota_bgrp_features;
        }
 }
-#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0) */
+#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 56, 0) */
 
 static int __init init_lquota(void)
 {
@@ -338,7 +338,7 @@ static int __init init_lquota(void)
        lquota_key_init_generic(&lquota_thread_key, NULL);
        lu_context_key_register(&lquota_thread_key);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 56, 0)
        dt_quota_iusr_features = dt_quota_busr_features = dt_quota_glb_features;
        dt_quota_igrp_features = dt_quota_bgrp_features = dt_quota_glb_features;
 #endif