LU-11397 idl: remove obsolete RPC flags

Remove RPC flags that are no longer in use:
- OBD_MD_FLQOS		has never been used in master branch
- OBD_MD_FLEPOCH	unused since v2_7_50_0-38-gd5d5b349f2
- OBD_MD_REINT		unused since before 1.6
- OBD_MD_FLMDSCAPA	unused since v2_7_55_0-15-g353ef58b1d
- OBD_MD_FLOSSCAPA	unused since v2_7_55_0-15-g353ef58b1d

Rename OBD_MD_FLGENER to OBD_MD_FLPARENT to more accurately describe
that this flag is only used to mark the parent FID in the OST obdo.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I7ef8ee5a403a7f4d0184bb279198d93e1198e9de
Reviewed-on: https://review.whamcloud.com/33202
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Mike Pershin <mpershin@whamcloud.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index 9a8963a..47c82ee 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -1233,20 +1233,19 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
 #define OBD_MD_FLFLAGS     (0x00000800ULL) /* flags word */
 #define OBD_MD_DOM_SIZE    (0X00001000ULL) /* Data-on-MDT component size */
 #define OBD_MD_FLNLINK     (0x00002000ULL) /* link count */
-#define OBD_MD_FLGENER     (0x00004000ULL) /* generation number */
-#define OBD_MD_LAYOUT_VERSION (0x00008000ULL) /* layout version for
-                                              * OST objects */
+#define OBD_MD_FLPARENT    (0x00004000ULL) /* parent FID */
+#define OBD_MD_LAYOUT_VERSION (0x00008000ULL) /* OST object layout version */
 #define OBD_MD_FLRDEV      (0x00010000ULL) /* device number */
 #define OBD_MD_FLEASIZE    (0x00020000ULL) /* extended attribute data */
 #define OBD_MD_LINKNAME    (0x00040000ULL) /* symbolic link target */
 #define OBD_MD_FLHANDLE    (0x00080000ULL) /* file/lock handle */
 #define OBD_MD_FLCKSUM     (0x00100000ULL) /* bulk data checksum */
-#define OBD_MD_FLQOS       (0x00200000ULL) /* quality of service stats */
-/*     OBD_MD_FLCOOKIE    (0x00800000ULL)    obsolete in 2.8 */
+/*     OBD_MD_FLQOS       (0x00200000ULL) has never been used */
+/*     OBD_MD_FLCOOKIE    (0x00800000ULL) obsolete in 2.8 */
 #define OBD_MD_FLPRJQUOTA  (0x00400000ULL) /* over quota flags sent from ost */
 #define OBD_MD_FLGROUP     (0x01000000ULL) /* group */
 #define OBD_MD_FLFID       (0x02000000ULL) /* ->ost write inline fid */
-#define OBD_MD_FLEPOCH     (0x04000000ULL) /* ->ost write with ioepoch */
+/*     OBD_MD_FLEPOCH     (0x04000000ULL) obsolete 2.7.50 */
                                            /* ->mds if epoch opens or closes */
 #define OBD_MD_FLGRANT     (0x08000000ULL) /* ost preallocation space grant */
 #define OBD_MD_FLDIREA     (0x10000000ULL) /* dir's extended attribute data */
@@ -1255,7 +1254,7 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
 #define OBD_MD_FLMODEASIZE (0x80000000ULL) /* EA size will be changed */
 
 #define OBD_MD_MDS         (0x0000000100000000ULL) /* where an inode lives on */
-#define OBD_MD_REINT       (0x0000000200000000ULL) /* reintegrate oa */
+/*     OBD_MD_REINT       (0x0000000200000000ULL) obsolete 1.8 */
 #define OBD_MD_MEA         (0x0000000400000000ULL) /* CMD split EA  */
 #define OBD_MD_TSTATE      (0x0000000800000000ULL) /* transient state field */
 
@@ -1264,8 +1263,8 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
 #define OBD_MD_FLXATTRRM     (0x0000004000000000ULL) /* xattr remove */
 #define OBD_MD_FLACL         (0x0000008000000000ULL) /* ACL */
 #define OBD_MD_FLAGSTATFS    (0x0000010000000000ULL) /* aggregated statfs */
-#define OBD_MD_FLMDSCAPA     (0x0000020000000000ULL) /* MDS capability */
-#define OBD_MD_FLOSSCAPA     (0x0000040000000000ULL) /* OSS capability */
+/*     OBD_MD_FLMDSCAPA     (0x0000020000000000ULL) obsolete 2.7.54 */
+/*     OBD_MD_FLOSSCAPA     (0x0000040000000000ULL) obsolete 2.7.54 */
 /*      OBD_MD_FLCKSPLIT     (0x0000080000000000ULL) obsolete 2.3.58*/
 #define OBD_MD_FLCROSSREF    (0x0000100000000000ULL) /* Cross-ref case */
 #define OBD_MD_FLGETATTRLOCK (0x0000200000000000ULL) /* Get IOEpoch attributes
@@ -1290,7 +1289,7 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
                          OBD_MD_FLCTIME | OBD_MD_FLSIZE  | OBD_MD_FLBLKSZ | \
                          OBD_MD_FLMODE  | OBD_MD_FLTYPE  | OBD_MD_FLUID   | \
                          OBD_MD_FLGID   | OBD_MD_FLFLAGS | OBD_MD_FLNLINK | \
-                         OBD_MD_FLGENER | OBD_MD_FLRDEV  | OBD_MD_FLGROUP | \
+                         OBD_MD_FLPARENT | OBD_MD_FLRDEV  | OBD_MD_FLGROUP | \
                          OBD_MD_FLPROJID)
 
 #define OBD_MD_FLXATTRALL (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS)

diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c
index a948042..6f0ec2f 100644 (file)
--- a/lustre/mdt/mdt_lib.c
+++ b/lustre/mdt/mdt_lib.c
@@ -768,20 +768,12 @@ int mdt_fix_reply(struct mdt_thread_info *info)
                req_capsule_shrink(pill, &RMF_LOGCOOKIES, acl_size, RCL_SERVER);
        }
 
-       if (req_capsule_has_field(pill, &RMF_CAPA1, RCL_SERVER) &&
-           !(body->mbo_valid & OBD_MD_FLMDSCAPA))
-               req_capsule_shrink(pill, &RMF_CAPA1, 0, RCL_SERVER);
+       /*
+        * Some more field should be shrinked if needed.
+        * This should be done by those who added fields to reply message.
+        */
 
-       if (req_capsule_has_field(pill, &RMF_CAPA2, RCL_SERVER) &&
-           !(body->mbo_valid & OBD_MD_FLOSSCAPA))
-               req_capsule_shrink(pill, &RMF_CAPA2, 0, RCL_SERVER);
-
-        /*
-         * Some more field should be shrinked if needed.
-         * This should be done by those who added fields to reply message.
-         */
-
-        /* Grow MD buffer if needed finally */
+       /* Grow MD buffer if needed finally */
        if (info->mti_big_lmm_used) {
                 void *lmm;
 

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 2321a83..6bf9415 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -47,10 +47,10 @@
 
 void obdo_set_parent_fid(struct obdo *dst, const struct lu_fid *parent)
 {
-        dst->o_parent_oid = fid_oid(parent);
-        dst->o_parent_seq = fid_seq(parent);
-        dst->o_parent_ver = fid_ver(parent);
-        dst->o_valid |= OBD_MD_FLGENER | OBD_MD_FLFID;
+       dst->o_parent_oid = fid_oid(parent);
+       dst->o_parent_seq = fid_seq(parent);
+       dst->o_parent_ver = fid_ver(parent);
+       dst->o_valid |= OBD_MD_FLPARENT | OBD_MD_FLFID;
 }
 EXPORT_SYMBOL(obdo_set_parent_fid);
 
@@ -125,39 +125,39 @@ EXPORT_SYMBOL(obdo_from_inode);
 void obdo_cpy_md(struct obdo *dst, const struct obdo *src, u64 valid)
 {
        CDEBUG(D_INODE, "src obdo "DOSTID" valid %#llx, dst obdo "DOSTID"\n",
-               POSTID(&src->o_oi), src->o_valid, POSTID(&dst->o_oi));
-        if (valid & OBD_MD_FLATIME)
-                dst->o_atime = src->o_atime;
-        if (valid & OBD_MD_FLMTIME)
-                dst->o_mtime = src->o_mtime;
-        if (valid & OBD_MD_FLCTIME)
-                dst->o_ctime = src->o_ctime;
-        if (valid & OBD_MD_FLSIZE)
-                dst->o_size = src->o_size;
-        if (valid & OBD_MD_FLBLOCKS) /* allocation of space */
-                dst->o_blocks = src->o_blocks;
-        if (valid & OBD_MD_FLBLKSZ)
-                dst->o_blksize = src->o_blksize;
-        if (valid & OBD_MD_FLTYPE)
-                dst->o_mode = (dst->o_mode & ~S_IFMT) | (src->o_mode & S_IFMT);
-        if (valid & OBD_MD_FLMODE)
-                dst->o_mode = (dst->o_mode & S_IFMT) | (src->o_mode & ~S_IFMT);
-        if (valid & OBD_MD_FLUID)
-                dst->o_uid = src->o_uid;
-        if (valid & OBD_MD_FLGID)
-                dst->o_gid = src->o_gid;
-        if (valid & OBD_MD_FLFLAGS)
-                dst->o_flags = src->o_flags;
-        if (valid & OBD_MD_FLFID) {
-                dst->o_parent_seq = src->o_parent_seq;
-                dst->o_parent_ver = src->o_parent_ver;
-        }
-        if (valid & OBD_MD_FLGENER)
-                dst->o_parent_oid = src->o_parent_oid;
-        if (valid & OBD_MD_FLHANDLE)
-                dst->o_handle = src->o_handle;
+              POSTID(&src->o_oi), src->o_valid, POSTID(&dst->o_oi));
+       if (valid & OBD_MD_FLATIME)
+               dst->o_atime = src->o_atime;
+       if (valid & OBD_MD_FLMTIME)
+               dst->o_mtime = src->o_mtime;
+       if (valid & OBD_MD_FLCTIME)
+               dst->o_ctime = src->o_ctime;
+       if (valid & OBD_MD_FLSIZE)
+               dst->o_size = src->o_size;
+       if (valid & OBD_MD_FLBLOCKS) /* allocation of space */
+               dst->o_blocks = src->o_blocks;
+       if (valid & OBD_MD_FLBLKSZ)
+               dst->o_blksize = src->o_blksize;
+       if (valid & OBD_MD_FLTYPE)
+               dst->o_mode = (dst->o_mode & ~S_IFMT) | (src->o_mode & S_IFMT);
+       if (valid & OBD_MD_FLMODE)
+               dst->o_mode = (dst->o_mode & S_IFMT) | (src->o_mode & ~S_IFMT);
+       if (valid & OBD_MD_FLUID)
+               dst->o_uid = src->o_uid;
+       if (valid & OBD_MD_FLGID)
+               dst->o_gid = src->o_gid;
+       if (valid & OBD_MD_FLFLAGS)
+               dst->o_flags = src->o_flags;
+       if (valid & OBD_MD_FLFID) {
+               dst->o_parent_seq = src->o_parent_seq;
+               dst->o_parent_ver = src->o_parent_ver;
+       }
+       if (valid & OBD_MD_FLPARENT)
+               dst->o_parent_oid = src->o_parent_oid;
+       if (valid & OBD_MD_FLHANDLE)
+               dst->o_handle = src->o_handle;
 
-        dst->o_valid |= valid;
+       dst->o_valid |= valid;
 }
 EXPORT_SYMBOL(obdo_cpy_md);
 

diff --git a/lustre/osp/osp_precreate.c b/lustre/osp/osp_precreate.c
index 125cc82..aedec3d 100644 (file)
--- a/lustre/osp/osp_precreate.c
+++ b/lustre/osp/osp_precreate.c
@@ -1610,8 +1610,6 @@ int osp_object_truncate(const struct lu_env *env, struct dt_object *dt,
        if (req == NULL)
                RETURN(-ENOMEM);
 
-       /* XXX: capa support? */
-       /* osc_set_capa_size(req, &RMF_CAPA1, capa); */
        rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_PUNCH);
        if (rc) {
                ptlrpc_request_free(req);

diff --git a/lustre/ptlrpc/layout.c b/lustre/ptlrpc/layout.c
index 2750967..9edfd18 100644 (file)
--- a/lustre/ptlrpc/layout.c
+++ b/lustre/ptlrpc/layout.c
@@ -1085,13 +1085,11 @@ struct req_msg_field RMF_LOGCOOKIES =
 EXPORT_SYMBOL(RMF_LOGCOOKIES);
 
 struct req_msg_field RMF_CAPA1 =
-        DEFINE_MSGF("capa", 0, sizeof(struct lustre_capa),
-                    lustre_swab_lustre_capa, NULL);
+       DEFINE_MSGF("capa", 0, 0, NULL, NULL);
 EXPORT_SYMBOL(RMF_CAPA1);
 
 struct req_msg_field RMF_CAPA2 =
-        DEFINE_MSGF("capa", 0, sizeof(struct lustre_capa),
-                    lustre_swab_lustre_capa, NULL);
+       DEFINE_MSGF("capa", 0, 0, NULL, NULL);
 EXPORT_SYMBOL(RMF_CAPA2);
 
 struct req_msg_field RMF_LAYOUT_INTENT =

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 21b2c20..216c086 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -2464,54 +2464,51 @@ void dump_obdo(struct obdo *oa)
        if (valid & OBD_MD_FLFID)
                CDEBUG(D_RPCTRACE, "obdo: o_parent_seq = %#llx\n",
                       oa->o_parent_seq);
-        if (valid & OBD_MD_FLSIZE)
+       if (valid & OBD_MD_FLSIZE)
                CDEBUG(D_RPCTRACE, "obdo: o_size = %lld\n", oa->o_size);
-        if (valid & OBD_MD_FLMTIME)
+       if (valid & OBD_MD_FLMTIME)
                CDEBUG(D_RPCTRACE, "obdo: o_mtime = %lld\n", oa->o_mtime);
-        if (valid & OBD_MD_FLATIME)
+       if (valid & OBD_MD_FLATIME)
                CDEBUG(D_RPCTRACE, "obdo: o_atime = %lld\n", oa->o_atime);
-        if (valid & OBD_MD_FLCTIME)
+       if (valid & OBD_MD_FLCTIME)
                CDEBUG(D_RPCTRACE, "obdo: o_ctime = %lld\n", oa->o_ctime);
-        if (valid & OBD_MD_FLBLOCKS)   /* allocation of space */
+       if (valid & OBD_MD_FLBLOCKS)   /* allocation of space */
                CDEBUG(D_RPCTRACE, "obdo: o_blocks = %lld\n", oa->o_blocks);
-        if (valid & OBD_MD_FLGRANT)
+       if (valid & OBD_MD_FLGRANT)
                CDEBUG(D_RPCTRACE, "obdo: o_grant = %lld\n", oa->o_grant);
-        if (valid & OBD_MD_FLBLKSZ)
-                CDEBUG(D_RPCTRACE, "obdo: o_blksize = %d\n", oa->o_blksize);
-        if (valid & (OBD_MD_FLTYPE | OBD_MD_FLMODE))
-                CDEBUG(D_RPCTRACE, "obdo: o_mode = %o\n",
-                       oa->o_mode & ((valid & OBD_MD_FLTYPE ?  S_IFMT : 0) |
-                                     (valid & OBD_MD_FLMODE ? ~S_IFMT : 0)));
-        if (valid & OBD_MD_FLUID)
-                CDEBUG(D_RPCTRACE, "obdo: o_uid = %u\n", oa->o_uid);
-        if (valid & OBD_MD_FLUID)
-                CDEBUG(D_RPCTRACE, "obdo: o_uid_h = %u\n", oa->o_uid_h);
-        if (valid & OBD_MD_FLGID)
-                CDEBUG(D_RPCTRACE, "obdo: o_gid = %u\n", oa->o_gid);
-        if (valid & OBD_MD_FLGID)
-                CDEBUG(D_RPCTRACE, "obdo: o_gid_h = %u\n", oa->o_gid_h);
-        if (valid & OBD_MD_FLFLAGS)
-                CDEBUG(D_RPCTRACE, "obdo: o_flags = %x\n", oa->o_flags);
-        if (valid & OBD_MD_FLNLINK)
-                CDEBUG(D_RPCTRACE, "obdo: o_nlink = %u\n", oa->o_nlink);
-        else if (valid & OBD_MD_FLCKSUM)
-                CDEBUG(D_RPCTRACE, "obdo: o_checksum (o_nlink) = %u\n",
-                       oa->o_nlink);
-        if (valid & OBD_MD_FLGENER)
-                CDEBUG(D_RPCTRACE, "obdo: o_parent_oid = %x\n",
-                       oa->o_parent_oid);
-        if (valid & OBD_MD_FLEPOCH)
-               CDEBUG(D_RPCTRACE, "obdo: o_ioepoch = %lld\n",
-                       oa->o_ioepoch);
-        if (valid & OBD_MD_FLFID) {
-                CDEBUG(D_RPCTRACE, "obdo: o_stripe_idx = %u\n",
-                       oa->o_stripe_idx);
-                CDEBUG(D_RPCTRACE, "obdo: o_parent_ver = %x\n",
-                       oa->o_parent_ver);
-        }
-        if (valid & OBD_MD_FLHANDLE)
+       if (valid & OBD_MD_FLBLKSZ)
+               CDEBUG(D_RPCTRACE, "obdo: o_blksize = %d\n", oa->o_blksize);
+       if (valid & (OBD_MD_FLTYPE | OBD_MD_FLMODE))
+               CDEBUG(D_RPCTRACE, "obdo: o_mode = %o\n",
+                      oa->o_mode & ((valid & OBD_MD_FLTYPE ?  S_IFMT : 0) |
+                                    (valid & OBD_MD_FLMODE ? ~S_IFMT : 0)));
+       if (valid & OBD_MD_FLUID)
+               CDEBUG(D_RPCTRACE, "obdo: o_uid = %u\n", oa->o_uid);
+       if (valid & OBD_MD_FLUID)
+               CDEBUG(D_RPCTRACE, "obdo: o_uid_h = %u\n", oa->o_uid_h);
+       if (valid & OBD_MD_FLGID)
+               CDEBUG(D_RPCTRACE, "obdo: o_gid = %u\n", oa->o_gid);
+       if (valid & OBD_MD_FLGID)
+               CDEBUG(D_RPCTRACE, "obdo: o_gid_h = %u\n", oa->o_gid_h);
+       if (valid & OBD_MD_FLFLAGS)
+               CDEBUG(D_RPCTRACE, "obdo: o_flags = %x\n", oa->o_flags);
+       if (valid & OBD_MD_FLNLINK)
+               CDEBUG(D_RPCTRACE, "obdo: o_nlink = %u\n", oa->o_nlink);
+       else if (valid & OBD_MD_FLCKSUM)
+               CDEBUG(D_RPCTRACE, "obdo: o_checksum (o_nlink) = %u\n",
+                      oa->o_nlink);
+       if (valid & OBD_MD_FLPARENT)
+               CDEBUG(D_RPCTRACE, "obdo: o_parent_oid = %x\n",
+                      oa->o_parent_oid);
+       if (valid & OBD_MD_FLFID) {
+               CDEBUG(D_RPCTRACE, "obdo: o_stripe_idx = %u\n",
+                      oa->o_stripe_idx);
+               CDEBUG(D_RPCTRACE, "obdo: o_parent_ver = %x\n",
+                      oa->o_parent_ver);
+       }
+       if (valid & OBD_MD_FLHANDLE)
                CDEBUG(D_RPCTRACE, "obdo: o_handle = %lld\n",
-                       oa->o_handle.cookie);
+                      oa->o_handle.cookie);
 }
 
 void dump_ost_body(struct ost_body *ob)

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index aea5302..1e5d97b 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -1526,8 +1526,8 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLFLAGS);
        LASSERTF(OBD_MD_FLNLINK == (0x00002000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLNLINK);
-       LASSERTF(OBD_MD_FLGENER == (0x00004000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLGENER);
+       LASSERTF(OBD_MD_FLPARENT == (0x00004000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLPARENT);
        LASSERTF(OBD_MD_FLRDEV == (0x00010000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLRDEV);
        LASSERTF(OBD_MD_FLEASIZE == (0x00020000ULL), "found 0x%.16llxULL\n",
@@ -1538,14 +1538,10 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLHANDLE);
        LASSERTF(OBD_MD_FLCKSUM == (0x00100000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCKSUM);
-       LASSERTF(OBD_MD_FLQOS == (0x00200000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLQOS);
        LASSERTF(OBD_MD_FLGROUP == (0x01000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGROUP);
        LASSERTF(OBD_MD_FLFID == (0x02000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLFID);
-       LASSERTF(OBD_MD_FLEPOCH == (0x04000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLEPOCH);
        LASSERTF(OBD_MD_FLGRANT == (0x08000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGRANT);
        LASSERTF(OBD_MD_FLDIREA == (0x10000000ULL), "found 0x%.16llxULL\n",
@@ -1558,8 +1554,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLMODEASIZE);
        LASSERTF(OBD_MD_MDS == (0x0000000100000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_MDS);
-       LASSERTF(OBD_MD_REINT == (0x0000000200000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_REINT);
        LASSERTF(OBD_MD_MEA == (0x0000000400000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_MEA);
        LASSERTF(OBD_MD_TSTATE == (0x0000000800000000ULL), "found 0x%.16llxULL\n",
@@ -1572,10 +1566,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLXATTRRM);
        LASSERTF(OBD_MD_FLACL == (0x0000008000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLACL);
-       LASSERTF(OBD_MD_FLMDSCAPA == (0x0000020000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLMDSCAPA);
-       LASSERTF(OBD_MD_FLOSSCAPA == (0x0000040000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLOSSCAPA);
        LASSERTF(OBD_MD_FLCROSSREF == (0x0000100000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCROSSREF);
        LASSERTF(OBD_MD_FLGETATTRLOCK == (0x0000200000000000ULL), "found 0x%.16llxULL\n",

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 203f367..816f7eb 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -677,31 +677,26 @@ check_obdo(void)
        CHECK_DEFINE_64X(OBD_MD_FLGID);
        CHECK_DEFINE_64X(OBD_MD_FLFLAGS);
        CHECK_DEFINE_64X(OBD_MD_FLNLINK);
-       CHECK_DEFINE_64X(OBD_MD_FLGENER);
+       CHECK_DEFINE_64X(OBD_MD_FLPARENT);
        CHECK_DEFINE_64X(OBD_MD_FLRDEV);
        CHECK_DEFINE_64X(OBD_MD_FLEASIZE);
        CHECK_DEFINE_64X(OBD_MD_LINKNAME);
        CHECK_DEFINE_64X(OBD_MD_FLHANDLE);
        CHECK_DEFINE_64X(OBD_MD_FLCKSUM);
-       CHECK_DEFINE_64X(OBD_MD_FLQOS);
        CHECK_DEFINE_64X(OBD_MD_FLGROUP);
        CHECK_DEFINE_64X(OBD_MD_FLFID);
-       CHECK_DEFINE_64X(OBD_MD_FLEPOCH);
        CHECK_DEFINE_64X(OBD_MD_FLGRANT);
        CHECK_DEFINE_64X(OBD_MD_FLDIREA);
        CHECK_DEFINE_64X(OBD_MD_FLUSRQUOTA);
        CHECK_DEFINE_64X(OBD_MD_FLGRPQUOTA);
        CHECK_DEFINE_64X(OBD_MD_FLMODEASIZE);
        CHECK_DEFINE_64X(OBD_MD_MDS);
-       CHECK_DEFINE_64X(OBD_MD_REINT);
        CHECK_DEFINE_64X(OBD_MD_MEA);
        CHECK_DEFINE_64X(OBD_MD_TSTATE);
        CHECK_DEFINE_64X(OBD_MD_FLXATTR);
        CHECK_DEFINE_64X(OBD_MD_FLXATTRLS);
        CHECK_DEFINE_64X(OBD_MD_FLXATTRRM);
        CHECK_DEFINE_64X(OBD_MD_FLACL);
-       CHECK_DEFINE_64X(OBD_MD_FLMDSCAPA);
-       CHECK_DEFINE_64X(OBD_MD_FLOSSCAPA);
        CHECK_DEFINE_64X(OBD_MD_FLCROSSREF);
        CHECK_DEFINE_64X(OBD_MD_FLGETATTRLOCK);
        CHECK_DEFINE_64X(OBD_MD_FLDATAVERSION);

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 38ea6ef..21f8754 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -1547,8 +1547,8 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLFLAGS);
        LASSERTF(OBD_MD_FLNLINK == (0x00002000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLNLINK);
-       LASSERTF(OBD_MD_FLGENER == (0x00004000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLGENER);
+       LASSERTF(OBD_MD_FLPARENT == (0x00004000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLPARENT);
        LASSERTF(OBD_MD_FLRDEV == (0x00010000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLRDEV);
        LASSERTF(OBD_MD_FLEASIZE == (0x00020000ULL), "found 0x%.16llxULL\n",
@@ -1559,14 +1559,10 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLHANDLE);
        LASSERTF(OBD_MD_FLCKSUM == (0x00100000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCKSUM);
-       LASSERTF(OBD_MD_FLQOS == (0x00200000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLQOS);
        LASSERTF(OBD_MD_FLGROUP == (0x01000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGROUP);
        LASSERTF(OBD_MD_FLFID == (0x02000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLFID);
-       LASSERTF(OBD_MD_FLEPOCH == (0x04000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLEPOCH);
        LASSERTF(OBD_MD_FLGRANT == (0x08000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGRANT);
        LASSERTF(OBD_MD_FLDIREA == (0x10000000ULL), "found 0x%.16llxULL\n",
@@ -1579,8 +1575,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLMODEASIZE);
        LASSERTF(OBD_MD_MDS == (0x0000000100000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_MDS);
-       LASSERTF(OBD_MD_REINT == (0x0000000200000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_REINT);
        LASSERTF(OBD_MD_MEA == (0x0000000400000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_MEA);
        LASSERTF(OBD_MD_TSTATE == (0x0000000800000000ULL), "found 0x%.16llxULL\n",
@@ -1593,10 +1587,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLXATTRRM);
        LASSERTF(OBD_MD_FLACL == (0x0000008000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLACL);
-       LASSERTF(OBD_MD_FLMDSCAPA == (0x0000020000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLMDSCAPA);
-       LASSERTF(OBD_MD_FLOSSCAPA == (0x0000040000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLOSSCAPA);
        LASSERTF(OBD_MD_FLCROSSREF == (0x0000100000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCROSSREF);
        LASSERTF(OBD_MD_FLGETATTRLOCK == (0x0000200000000000ULL), "found 0x%.16llxULL\n",