memcpy(buf, secctx, buf_size);
}
+void mdc_file_sepol_pack(struct ptlrpc_request *req)
+{
+ void *buf;
+ size_t buf_size;
+
+ if (strlen(req->rq_sepol) == 0)
+ return;
+
+ buf = req_capsule_client_get(&req->rq_pill, &RMF_SELINUX_POL);
+ buf_size = req_capsule_get_size(&req->rq_pill, &RMF_SELINUX_POL,
+ RCL_CLIENT);
+
+ LASSERT(buf_size == strlen(req->rq_sepol) + 1);
+ snprintf(buf, strlen(req->rq_sepol) + 1, "%s", req->rq_sepol);
+}
+
void mdc_readdir_pack(struct ptlrpc_request *req, __u64 pgoff, size_t size,
const struct lu_fid *fid)
{
mdc_file_secctx_pack(req, op_data->op_file_secctx_name,
op_data->op_file_secctx,
op_data->op_file_secctx_size);
+
+ /* pack SELinux policy info if any */
+ mdc_file_sepol_pack(req);
}
static inline __u64 mds_pack_open_flags(__u64 flags)
rec->cr_suppgid1 = op_data->op_suppgids[0];
rec->cr_suppgid2 = op_data->op_suppgids[1];
rec->cr_bias = op_data->op_bias;
- rec->cr_old_handle = op_data->op_handle;
+ rec->cr_open_handle_old = op_data->op_open_handle;
if (op_data->op_name) {
mdc_pack_name(req, &RMF_NAME, op_data->op_name,
mdc_file_secctx_pack(req, op_data->op_file_secctx_name,
op_data->op_file_secctx,
op_data->op_file_secctx_size);
+
+ /* pack SELinux policy info if any */
+ mdc_file_sepol_pack(req);
}
if (lmm) {
cr_flags |= MDS_OPEN_HAS_EA;
tmp = req_capsule_client_get(&req->rq_pill, &RMF_EADATA);
memcpy(tmp, lmm, lmmlen);
+ if (cr_flags & MDS_OPEN_PCC) {
+ LASSERT(op_data != NULL);
+ rec->cr_archive_id = op_data->op_archive_id;
+ }
}
set_mrc_cr_flags(rec, cr_flags);
}
-static inline __u64 attr_pack(unsigned int ia_valid) {
- __u64 sa_valid = 0;
+static inline u64 attr_pack(unsigned int ia_valid, enum op_xvalid ia_xvalid)
+{
+ u64 sa_valid = 0;
if (ia_valid & ATTR_MODE)
sa_valid |= MDS_ATTR_MODE;
sa_valid |= MDS_ATTR_MTIME_SET;
if (ia_valid & ATTR_FORCE)
sa_valid |= MDS_ATTR_FORCE;
- if (ia_valid & ATTR_ATTR_FLAG)
- sa_valid |= MDS_ATTR_ATTR_FLAG;
- if (ia_valid & ATTR_KILL_SUID)
- sa_valid |= MDS_ATTR_KILL_SUID;
- if (ia_valid & ATTR_KILL_SGID)
- sa_valid |= MDS_ATTR_KILL_SGID;
- if (ia_valid & ATTR_CTIME_SET)
- sa_valid |= MDS_ATTR_CTIME_SET;
- if (ia_valid & ATTR_FROM_OPEN)
- sa_valid |= MDS_ATTR_FROM_OPEN;
- if (ia_valid & ATTR_BLOCKS)
- sa_valid |= MDS_ATTR_BLOCKS;
- if (ia_valid & MDS_OPEN_OWNEROVERRIDE)
- /* NFSD hack (see bug 5781) */
- sa_valid |= MDS_OPEN_OWNEROVERRIDE;
- if (ia_valid & MDS_ATTR_PROJID)
+ if (ia_xvalid & OP_XVALID_FLAGS)
+ sa_valid |= MDS_ATTR_ATTR_FLAG;
+ if (ia_valid & ATTR_KILL_SUID)
+ sa_valid |= MDS_ATTR_KILL_SUID;
+ if (ia_valid & ATTR_KILL_SGID)
+ sa_valid |= MDS_ATTR_KILL_SGID;
+ if (ia_xvalid & OP_XVALID_CTIME_SET)
+ sa_valid |= MDS_ATTR_CTIME_SET;
+ if (ia_valid & ATTR_OPEN)
+ sa_valid |= MDS_ATTR_FROM_OPEN;
+ if (ia_xvalid & OP_XVALID_BLOCKS)
+ sa_valid |= MDS_ATTR_BLOCKS;
+ if (ia_xvalid & OP_XVALID_OWNEROVERRIDE)
+ /* NFSD hack (see bug 5781) */
+ sa_valid |= MDS_OPEN_OWNEROVERRIDE;
+ if (ia_xvalid & OP_XVALID_PROJID)
sa_valid |= MDS_ATTR_PROJID;
+ if (ia_xvalid & OP_XVALID_LAZYSIZE)
+ sa_valid |= MDS_ATTR_LSIZE;
+ if (ia_xvalid & OP_XVALID_LAZYBLOCKS)
+ sa_valid |= MDS_ATTR_LBLOCKS;
return sa_valid;
}
rec->sa_suppgid = -1;
rec->sa_fid = op_data->op_fid1;
- rec->sa_valid = attr_pack(op_data->op_attr.ia_valid);
+ rec->sa_valid = attr_pack(op_data->op_attr.ia_valid,
+ op_data->op_xvalid);
rec->sa_mode = op_data->op_attr.ia_mode;
rec->sa_uid = from_kuid(&init_user_ns, op_data->op_attr.ia_uid);
rec->sa_gid = from_kgid(&init_user_ns, op_data->op_attr.ia_gid);
rec->sa_projid = op_data->op_projid;
rec->sa_size = op_data->op_attr.ia_size;
rec->sa_blocks = op_data->op_attr_blocks;
- rec->sa_atime = LTIME_S(op_data->op_attr.ia_atime);
- rec->sa_mtime = LTIME_S(op_data->op_attr.ia_mtime);
- rec->sa_ctime = LTIME_S(op_data->op_attr.ia_ctime);
+ rec->sa_atime = op_data->op_attr.ia_atime.tv_sec;
+ rec->sa_mtime = op_data->op_attr.ia_mtime.tv_sec;
+ rec->sa_ctime = op_data->op_attr.ia_ctime.tv_sec;
rec->sa_attr_flags = op_data->op_attr_flags;
if ((op_data->op_attr.ia_valid & ATTR_GID) &&
in_group_p(op_data->op_attr.ia_gid))
static void mdc_ioepoch_pack(struct mdt_ioepoch *epoch,
struct md_op_data *op_data)
{
- epoch->mio_handle = op_data->op_handle;
+ epoch->mio_open_handle = op_data->op_open_handle;
epoch->mio_unused1 = 0;
epoch->mio_unused2 = 0;
epoch->mio_padding = 0;
lum->lmm_magic = cpu_to_le32(LOV_USER_MAGIC_V1);
lum->lmm_stripe_size = 0;
lum->lmm_stripe_count = 0;
- lum->lmm_stripe_offset = (typeof(lum->lmm_stripe_offset))(-1);
+ lum->lmm_stripe_offset =
+ (typeof(lum->lmm_stripe_offset))LOV_OFFSET_DEFAULT;
} else {
memcpy(lum, ea, ealen);
}
rec->ul_bias = op_data->op_bias;
mdc_pack_name(req, &RMF_NAME, op_data->op_name, op_data->op_namelen);
+
+ /* pack SELinux policy info if any */
+ mdc_file_sepol_pack(req);
}
void mdc_link_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
rec->lk_bias = op_data->op_bias;
mdc_pack_name(req, &RMF_NAME, op_data->op_name, op_data->op_namelen);
+
+ /* pack SELinux policy info if any */
+ mdc_file_sepol_pack(req);
}
static void mdc_close_intent_pack(struct ptlrpc_request *req,
struct ldlm_lock *lock;
enum mds_op_bias bias = op_data->op_bias;
- if (!(bias & (MDS_CLOSE_INTENT | MDS_RENAME_MIGRATE)))
+ if (!(bias & (MDS_CLOSE_INTENT | MDS_CLOSE_MIGRATE)))
return;
data = req_capsule_client_get(&req->rq_pill, &RMF_CLOSE_DATA);
memcpy(req_capsule_client_get(&req->rq_pill, &RMF_U32),
op_data->op_data, count * sizeof(__u32));
}
+ } else if (bias & MDS_PCC_ATTACH) {
+ data->cd_archive_id = op_data->op_archive_id;
}
}
rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
/* XXX do something about time, uid, gid */
- rec->rn_opcode = op_data->op_cli_flags & CLI_MIGRATE ?
- REINT_MIGRATE : REINT_RENAME;
- rec->rn_fsuid = op_data->op_fsuid;
- rec->rn_fsgid = op_data->op_fsgid;
- rec->rn_cap = op_data->op_cap;
- rec->rn_suppgid1 = op_data->op_suppgids[0];
- rec->rn_suppgid2 = op_data->op_suppgids[1];
- rec->rn_fid1 = op_data->op_fid1;
- rec->rn_fid2 = op_data->op_fid2;
- rec->rn_time = op_data->op_mod_time;
- rec->rn_mode = op_data->op_mode;
- rec->rn_bias = op_data->op_bias;
+ rec->rn_opcode = REINT_RENAME;
+ rec->rn_fsuid = op_data->op_fsuid;
+ rec->rn_fsgid = op_data->op_fsgid;
+ rec->rn_cap = op_data->op_cap;
+ rec->rn_suppgid1 = op_data->op_suppgids[0];
+ rec->rn_suppgid2 = op_data->op_suppgids[1];
+ rec->rn_fid1 = op_data->op_fid1;
+ rec->rn_fid2 = op_data->op_fid2;
+ rec->rn_time = op_data->op_mod_time;
+ rec->rn_mode = op_data->op_mode;
+ rec->rn_bias = op_data->op_bias;
mdc_pack_name(req, &RMF_NAME, old, oldlen);
if (new != NULL)
mdc_pack_name(req, &RMF_SYMTGT, new, newlen);
- if (op_data->op_cli_flags & CLI_MIGRATE &&
- op_data->op_bias & MDS_RENAME_MIGRATE) {
+ /* pack SELinux policy info if any */
+ mdc_file_sepol_pack(req);
+}
+
+void mdc_migrate_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
+ const char *name, size_t namelen)
+{
+ struct mdt_rec_rename *rec;
+ char *ea;
+
+ CLASSERT(sizeof(struct mdt_rec_reint) == sizeof(struct mdt_rec_rename));
+ rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
+
+ rec->rn_opcode = REINT_MIGRATE;
+ rec->rn_fsuid = op_data->op_fsuid;
+ rec->rn_fsgid = op_data->op_fsgid;
+ rec->rn_cap = op_data->op_cap;
+ rec->rn_suppgid1 = op_data->op_suppgids[0];
+ rec->rn_suppgid2 = op_data->op_suppgids[1];
+ rec->rn_fid1 = op_data->op_fid1;
+ rec->rn_fid2 = op_data->op_fid4;
+ rec->rn_time = op_data->op_mod_time;
+ rec->rn_mode = op_data->op_mode;
+ rec->rn_bias = op_data->op_bias;
+
+ mdc_pack_name(req, &RMF_NAME, name, namelen);
+
+ if (op_data->op_bias & MDS_CLOSE_MIGRATE) {
struct mdt_ioepoch *epoch;
mdc_close_intent_pack(req, op_data);
epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
mdc_ioepoch_pack(epoch, op_data);
}
+
+ ea = req_capsule_client_get(&req->rq_pill, &RMF_EADATA);
+ memcpy(ea, op_data->op_data, op_data->op_data_size);
}
void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, __u32 flags,
&RMF_MDT_BODY);
b->mbo_valid = valid;
- if (op_data->op_bias & MDS_CHECK_SPLIT)
- b->mbo_valid |= OBD_MD_FLCKSPLIT;
if (op_data->op_bias & MDS_CROSS_REF)
b->mbo_valid |= OBD_MD_FLCROSSREF;
b->mbo_eadatasize = ea_size;