Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-11838 lustre: discard LTIME_S macro
[fs/lustre-release.git] / lustre / mdc / mdc_lib.c
diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 0faf5bf..336761d 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -263,7 +263,7 @@ void mdc_open_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                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,
@@ -286,8 +286,9 @@ void mdc_open_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
        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 +310,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 +344,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))
@@ -367,7 +369,7 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec,
 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;
@@ -496,8 +498,7 @@ void mdc_rename_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
        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_opcode   = REINT_RENAME;
        rec->rn_fsuid    = op_data->op_fsuid;
        rec->rn_fsgid    = op_data->op_fsgid;
        rec->rn_cap      = op_data->op_cap;
@@ -513,22 +514,41 @@ 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);
+}
 
-       if (op_data->op_cli_flags & CLI_MIGRATE) {
-               char *tmp;
+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;
 
-               if (op_data->op_bias & MDS_CLOSE_MIGRATE) {
-                       struct mdt_ioepoch *epoch;
+       CLASSERT(sizeof(struct mdt_rec_reint) == sizeof(struct mdt_rec_rename));
+       rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
 
-                       mdc_close_intent_pack(req, op_data);
-                       epoch = req_capsule_client_get(&req->rq_pill,
-                                                       &RMF_MDT_EPOCH);
-                       mdc_ioepoch_pack(epoch, op_data);
-               }
+       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;
 
-               tmp = req_capsule_client_get(&req->rq_pill, &RMF_EADATA);
-               memcpy(tmp, op_data->op_data, op_data->op_data_size);
+       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,
Lustre primary development and releases