LU-12635 build: Support for gcc -Wimplicit-fallthrough

[fs/lustre-release.git] / lustre / mdc / mdc_lib.c

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 2429c1e..efa5469 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -147,6 +147,22 @@ void mdc_file_secctx_pack(struct ptlrpc_request *req, const char *secctx_name,
        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)
 {
@@ -200,6 +216,9 @@ void mdc_create_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
        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)
@@ -276,18 +295,26 @@ void mdc_open_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                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;
@@ -309,26 +336,26 @@ static inline __u64 attr_pack(unsigned int ia_valid) {
                 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_valid & MDS_ATTR_LSIZE)
+       if (ia_xvalid & OP_XVALID_LAZYSIZE)
                sa_valid |= MDS_ATTR_LSIZE;
-       if (ia_valid & MDS_ATTR_LBLOCKS)
+       if (ia_xvalid & OP_XVALID_LAZYBLOCKS)
                sa_valid |= MDS_ATTR_LBLOCKS;
         return sa_valid;
 }
@@ -343,16 +370,17 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec,
        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))
@@ -392,7 +420,8 @@ void mdc_setattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                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);
        }
@@ -420,6 +449,9 @@ void mdc_unlink_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
         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)
@@ -442,6 +474,9 @@ 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,
@@ -483,6 +518,8 @@ static void mdc_close_intent_pack(struct ptlrpc_request *req,
                        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;
        }
 }
 
@@ -512,6 +549,9 @@ void mdc_rename_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
 
        if (new != NULL)
                mdc_pack_name(req, &RMF_SYMTGT, new, newlen);
+
+       /* 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,