__u32 aclsize;
__u32 max_mdsize;
__u32 max_cookiesize;
- __u32 padding_4; /* also fix lustre_swab_mdt_body */
- __u64 padding_5;
+ __u32 uid_h; /* high 32-bits of uid, for FUID */
+ __u32 gid_h; /* high 32-bits of gid, for FUID */
+ __u32 padding_5; /* also fix lustre_swab_mdt_body */
__u64 padding_6;
__u64 padding_7;
__u64 padding_8;
__u32 rp_uid;
__u32 rp_gid;
__u32 rp_fsuid;
+ __u32 rp_fsuid_h;
__u32 rp_fsgid;
+ __u32 rp_fsgid_h;
__u32 rp_access_perm; /* MAY_READ/WRITE/EXEC */
};
struct lustre_handle o_handle; /* brw: lock handle to prolong locks */
struct llog_cookie o_lcookie; /* destroy: unlink cookie from MDS */
- __u64 o_padding_2;
+ __u32 o_uid_h;
+ __u32 o_gid_h;
__u64 o_padding_3;
__u64 o_padding_4;
__u64 o_padding_5;
__swab32s (&o->o_parent_ver);
/* o_handle is opaque */
/* o_lcookie is swabbed elsewhere */
- CLASSERT(offsetof(typeof(*o), o_padding_2) != 0);
+ __swab32s (&o->o_uid_h);
+ __swab32s (&o->o_gid_h);
CLASSERT(offsetof(typeof(*o), o_padding_3) != 0);
CLASSERT(offsetof(typeof(*o), o_padding_4) != 0);
CLASSERT(offsetof(typeof(*o), o_padding_5) != 0);
__swab32s (&b->aclsize);
__swab32s (&b->max_mdsize);
__swab32s (&b->max_cookiesize);
- CLASSERT(offsetof(typeof(*b), padding_4) != 0);
+ __swab32s (&b->uid_h);
+ __swab32s (&b->gid_h);
+ CLASSERT(offsetof(typeof(*b), padding_5) != 0);
}
void lustre_swab_mdt_ioepoch (struct mdt_ioepoch *b)
__swab32s (&p->rp_uid);
__swab32s (&p->rp_gid);
__swab32s (&p->rp_fsuid);
+ __swab32s (&p->rp_fsuid_h);
__swab32s (&p->rp_fsgid);
+ __swab32s (&p->rp_fsgid_h);
__swab32s (&p->rp_access_perm);
};
(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)
(long long)(int)offsetof(struct obdo, o_lcookie));
LASSERTF((int)sizeof(((struct obdo *)0)->o_lcookie) == 32, " found %lld\n",
(long long)(int)sizeof(((struct obdo *)0)->o_lcookie));
- LASSERTF((int)offsetof(struct obdo, o_padding_2) == 168, " found %lld\n",
- (long long)(int)offsetof(struct obdo, o_padding_2));
- LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_2) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct obdo *)0)->o_padding_2));
+ LASSERTF((int)offsetof(struct obdo, o_uid_h) == 168, " found %lld\n",
+ (long long)(int)offsetof(struct obdo, o_uid_h));
+ LASSERTF((int)sizeof(((struct obdo *)0)->o_uid_h) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct obdo *)0)->o_uid_h));
+ LASSERTF((int)offsetof(struct obdo, o_gid_h) == 172, " found %lld\n",
+ (long long)(int)offsetof(struct obdo, o_gid_h));
+ LASSERTF((int)sizeof(((struct obdo *)0)->o_gid_h) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct obdo *)0)->o_gid_h));
LASSERTF((int)offsetof(struct obdo, o_padding_3) == 176, " found %lld\n",
(long long)(int)offsetof(struct obdo, o_padding_3));
LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_3) == 8, " found %lld\n",
CHECK_MEMBER(obdo, o_parent_ver);
CHECK_MEMBER(obdo, o_handle);
CHECK_MEMBER(obdo, o_lcookie);
- CHECK_MEMBER(obdo, o_padding_2);
+ CHECK_MEMBER(obdo, o_uid_h);
+ CHECK_MEMBER(obdo, o_gid_h);
CHECK_MEMBER(obdo, o_padding_3);
CHECK_MEMBER(obdo, o_padding_4);
CHECK_MEMBER(obdo, o_padding_5);
(long long)(int)offsetof(struct obdo, o_lcookie));
LASSERTF((int)sizeof(((struct obdo *)0)->o_lcookie) == 32, " found %lld\n",
(long long)(int)sizeof(((struct obdo *)0)->o_lcookie));
- LASSERTF((int)offsetof(struct obdo, o_padding_2) == 168, " found %lld\n",
- (long long)(int)offsetof(struct obdo, o_padding_2));
- LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_2) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct obdo *)0)->o_padding_2));
+ LASSERTF((int)offsetof(struct obdo, o_uid_h) == 168, " found %lld\n",
+ (long long)(int)offsetof(struct obdo, o_uid_h));
+ LASSERTF((int)sizeof(((struct obdo *)0)->o_uid_h) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct obdo *)0)->o_uid_h));
+ LASSERTF((int)offsetof(struct obdo, o_gid_h) == 172, " found %lld\n",
+ (long long)(int)offsetof(struct obdo, o_gid_h));
+ LASSERTF((int)sizeof(((struct obdo *)0)->o_gid_h) == 4, " found %lld\n",
+ (long long)(int)sizeof(((struct obdo *)0)->o_gid_h));
LASSERTF((int)offsetof(struct obdo, o_padding_3) == 176, " found %lld\n",
(long long)(int)offsetof(struct obdo, o_padding_3));
LASSERTF((int)sizeof(((struct obdo *)0)->o_padding_3) == 8, " found %lld\n",