@@ -234,7 +234,8 @@ static int chlg_load(void *args)
rc = llog_init_handle(NULL, llh,
LLOG_F_IS_CAT |
LLOG_F_EXT_JOBID |
- LLOG_F_EXT_EXTRA_FLAGS,
+ LLOG_F_EXT_EXTRA_FLAGS |
+ LLOG_F_EXT_X_UIDGID,
NULL);
if (rc) {
CERROR("%s: fail to init llog handle: rc = %d\n",
@@ -2579,6 +2579,7 @@ enum llog_flag {
LLOG_F_EXT_JOBID = 0x8,
LLOG_F_IS_FIXSIZE = 0x10,
LLOG_F_EXT_EXTRA_FLAGS = 0x20,
+ LLOG_F_EXT_X_UIDGID = 0x40,
/*
* Note: Flags covered by LLOG_F_EXT_MASK will be inherited from
@@ -2586,7 +2587,8 @@ enum llog_flag {
* because the catlog record is usually fixed size, but its plain
* log record can be variable
*/
- LLOG_F_EXT_MASK = LLOG_F_EXT_JOBID | LLOG_F_EXT_EXTRA_FLAGS,
+ LLOG_F_EXT_MASK = LLOG_F_EXT_JOBID | LLOG_F_EXT_EXTRA_FLAGS |
+ LLOG_F_EXT_X_UIDGID,
};
/* On-disk header structure of each log object, stored in little endian order */
@@ -973,8 +973,9 @@ static inline void hsm_set_cl_error(int *flags, int error)
}
enum changelog_rec_extra_flags {
- CLFE_INVALID = 0, /* No additional flags currently implemented */
- CLFE_SUPPORTED = CLFE_INVALID
+ CLFE_INVALID = 0,
+ CLFE_UIDGID = 0x0001,
+ CLFE_SUPPORTED = CLFE_UIDGID
};
enum changelog_send_flag {
@@ -992,6 +993,11 @@ enum changelog_send_flag {
CHANGELOG_FLAG_EXTRA_FLAGS = 0x08,
};
+enum changelog_send_extra_flag {
+ /* Pack uid/gid into the changelog record */
+ CHANGELOG_EXTRA_FLAG_UIDGID = 0x01,
+};
+
#define CR_MAXSIZE __ALIGN_KERNEL(2 * NAME_MAX + 2 + \
changelog_rec_offset(CLF_SUPPORTED, \
CLFE_SUPPORTED), 8)
@@ -1037,6 +1043,12 @@ struct changelog_ext_extra_flags {
__u64 cr_extra_flags; /* Additional CLFE_* flags */
};
+/* Changelog extra extension to include UID/GID. */
+struct changelog_ext_uidgid {
+ __u64 cr_uid;
+ __u64 cr_gid;
+};
+
static inline struct changelog_ext_extra_flags *changelog_rec_extra_flags(
const struct changelog_rec *rec);
@@ -1051,8 +1063,11 @@ static inline size_t changelog_rec_offset(enum changelog_rec_flags crf,
if (crf & CLF_JOBID)
size += sizeof(struct changelog_ext_jobid);
- if (crf & CLF_EXTRA_FLAGS)
+ if (crf & CLF_EXTRA_FLAGS) {
size += sizeof(struct changelog_ext_extra_flags);
+ if (cref & CLFE_UIDGID)
+ size += sizeof(struct changelog_ext_uidgid);
+ }
return size;
}
@@ -1107,6 +1122,19 @@ struct changelog_ext_extra_flags *changelog_rec_extra_flags(
CLFE_INVALID));
}
+/* The uid/gid is the first extra extension */
+static inline
+struct changelog_ext_uidgid *changelog_rec_uidgid(
+ const struct changelog_rec *rec)
+{
+ enum changelog_rec_flags crf = rec->cr_flags &
+ (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS);
+
+ return (struct changelog_ext_uidgid *)((char *)rec +
+ changelog_rec_offset(crf,
+ CLFE_INVALID));
+}
+
/* The name follows the rename, jobid and extra flags extns, if present */
static inline char *changelog_rec_name(struct changelog_rec *rec)
{
@@ -1156,8 +1184,10 @@ static inline void changelog_remap_rec(struct changelog_rec *rec,
enum changelog_rec_flags crf_wanted,
enum changelog_rec_extra_flags cref_want)
{
+ char *uidgid_mov = NULL;
char *ef_mov;
char *jid_mov, *rnm_mov;
+ enum changelog_rec_extra_flags cref = CLFE_INVALID;
crf_wanted &= CLF_SUPPORTED;
cref_want &= CLFE_SUPPORTED;
@@ -1176,6 +1206,13 @@ static inline void changelog_remap_rec(struct changelog_rec *rec,
changelog_rec_name(rec), rec->cr_namelen);
/* Locations of extensions in the remapped record */
+ if (rec->cr_flags & CLF_EXTRA_FLAGS) {
+ uidgid_mov = (char *)rec +
+ changelog_rec_offset(crf_wanted & CLF_SUPPORTED,
+ CLFE_INVALID);
+ cref = changelog_rec_extra_flags(rec)->cr_extra_flags;
+ }
+
ef_mov = (char *)rec +
changelog_rec_offset(crf_wanted & ~CLF_EXTRA_FLAGS,
CLFE_INVALID);
@@ -1193,6 +1230,10 @@ static inline void changelog_remap_rec(struct changelog_rec *rec,
/* Move the extension fields to the desired positions */
if ((crf_wanted & CLF_EXTRA_FLAGS) &&
(rec->cr_flags & CLF_EXTRA_FLAGS)) {
+ if ((cref_want & CLFE_UIDGID) && (cref & CLFE_UIDGID))
+ memmove(uidgid_mov, changelog_rec_uidgid(rec),
+ sizeof(struct changelog_ext_uidgid));
+
memmove(ef_mov, changelog_rec_extra_flags(rec),
sizeof(struct changelog_ext_extra_flags));
}
@@ -1206,6 +1247,10 @@ static inline void changelog_remap_rec(struct changelog_rec *rec,
sizeof(struct changelog_ext_rename));
/* Clear newly added fields */
+ if (uidgid_mov && (cref_want & CLFE_UIDGID) &&
+ !(cref & CLFE_UIDGID))
+ memset(uidgid_mov, 0, sizeof(struct changelog_ext_uidgid));
+
if ((crf_wanted & CLF_EXTRA_FLAGS) &&
!(rec->cr_flags & CLF_EXTRA_FLAGS))
memset(ef_mov, 0, sizeof(struct changelog_ext_extra_flags));