b->uid = HTON__u32(inode->i_uid);
b->gid = HTON__u32(inode->i_gid);
b->flags = HTON__u32(inode->i_flags);
- //b->major = HTON__u32(inode->i_major);
- //b->minor = HTON__u32(inode->i_minor);
+ b->rdev = HTON__u32(b->rdev);
b->nlink = HTON__u32(inode->i_nlink);
b->generation = HTON__u32(inode->i_generation);
}
b->fsuid = HTON__u32(current->fsuid);
b->fsgid = HTON__u32(current->fsgid);
+ b->capability = HTON__u32(current->cap_effective);
mds_pack_fid(&b->fid1);
mds_pack_fid(&b->fid2);
struct inode *inode,
const char *name, int namelen)
{
- struct mds_body *rec;
- rec = lustre_msg_buf(req->rq_reqmsg, offset);
+ struct mds_body *b;
+ b = lustre_msg_buf(req->rq_reqmsg, offset);
+
+ b->fsuid = HTON__u32(current->fsuid);
+ b->fsgid = HTON__u32(current->fsgid);
+ b->capability = HTON__u32(current->cap_effective);
- ll_inode2fid(&rec->fid1, inode);
+ ll_inode2fid(&b->fid1, inode);
if (name) {
char *tmp;
tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1);
}
}
+void mds_readdir_pack(struct ptlrpc_request *req, int offset,
+ obd_id ino, int type)
+{
+ struct mds_body *b;
+
+ b = lustre_msg_buf(req->rq_reqmsg, offset);
+ b->fsuid = HTON__u32(current->fsuid);
+ b->fsgid = HTON__u32(current->fsgid);
+ b->capability = HTON__u32(current->cap_effective);
+ b->fid1.id = HTON__u64(ino);
+ b->fid1.f_type = HTON__u32(type);
+ b->size = HTON__u64(offset);
+}
+
void mds_pack_req_body(struct ptlrpc_request *req)
{
/* packing of MDS records */
-void mds_create_pack(struct ptlrpc_request *req, int offset,
- struct inode *inode, __u32 mode, __u64 rdev, __u32 uid,
- __u32 gid, __u64 time, const char *name, int namelen,
- const char *tgt, int tgtlen)
+void mds_create_pack(struct ptlrpc_request *req, int offset, struct inode *dir,
+ __u32 mode, __u64 rdev, __u32 uid, __u32 gid, __u64 time,
+ const char *name, int namelen,
+ const void *data, int datalen)
{
struct mds_rec_create *rec;
char *tmp;
rec->cr_opcode = HTON__u32(REINT_CREATE);
rec->cr_fsuid = HTON__u32(current->fsuid);
rec->cr_fsgid = HTON__u32(current->fsgid);
- ll_inode2fid(&rec->cr_fid, inode);
+ rec->cr_cap = HTON__u32(current->cap_effective);
+ ll_inode2fid(&rec->cr_fid, dir);
+ memset(&rec->cr_replayfid, 0, sizeof(rec->cr_replayfid));
rec->cr_mode = HTON__u32(mode);
rec->cr_rdev = HTON__u64(rdev);
rec->cr_uid = HTON__u32(uid);
tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1);
LOGL0(name, namelen, tmp);
- if (tgt) {
+ if (data) {
tmp = lustre_msg_buf(req->rq_reqmsg, offset + 2);
- LOGL0(tgt, tgtlen, tmp);
+ LOGL0(data, datalen, tmp);
}
}
rec->sa_opcode = HTON__u32(REINT_SETATTR);
rec->sa_fsuid = HTON__u32(current->fsuid);
rec->sa_fsgid = HTON__u32(current->fsgid);
+ rec->sa_cap = HTON__u32(current->cap_effective);
ll_inode2fid(&rec->sa_fid, inode);
rec->sa_valid = HTON__u32(iattr->ia_valid);
rec->sa_mode = HTON__u32(iattr->ia_mode);
rec->ul_opcode = HTON__u32(REINT_UNLINK);
rec->ul_fsuid = HTON__u32(current->fsuid);
rec->ul_fsgid = HTON__u32(current->fsgid);
+ rec->ul_cap = HTON__u32(current->cap_effective);
rec->ul_mode = HTON__u32(mode);
ll_inode2fid(&rec->ul_fid1, inode);
if (child)
rec->lk_opcode = HTON__u32(REINT_LINK);
rec->lk_fsuid = HTON__u32(current->fsuid);
rec->lk_fsgid = HTON__u32(current->fsgid);
+ rec->lk_cap = HTON__u32(current->cap_effective);
ll_inode2fid(&rec->lk_fid1, inode);
ll_inode2fid(&rec->lk_fid2, dir);
rec->rn_opcode = HTON__u32(REINT_RENAME);
rec->rn_fsuid = HTON__u32(current->fsuid);
rec->rn_fsgid = HTON__u32(current->fsgid);
+ rec->rn_cap = HTON__u32(current->cap_effective);
ll_inode2fid(&rec->rn_fid1, srcdir);
ll_inode2fid(&rec->rn_fid2, tgtdir);
b->valid = NTOH__u32(b->valid);
b->fsuid = NTOH__u32(b->fsuid);
b->fsgid = NTOH__u32(b->fsgid);
+ b->capability = NTOH__u32(b->capability);
b->ino = NTOH__u32(b->ino);
b->mode = NTOH__u32(b->mode);
b->uid = NTOH__u32(b->uid);
r->ur_fsuid = NTOH__u32(rec->sa_fsuid);
r->ur_fsgid = NTOH__u32(rec->sa_fsgid);
+ r->ur_cap = NTOH__u32(rec->sa_cap);
r->ur_fid1 = &rec->sa_fid;
attr->ia_valid = NTOH__u32(rec->sa_valid);
attr->ia_mode = NTOH__u32(rec->sa_mode);
r->ur_fsuid = NTOH__u32(rec->cr_fsuid);
r->ur_fsgid = NTOH__u32(rec->cr_fsgid);
+ r->ur_cap = NTOH__u32(rec->cr_cap);
r->ur_fid1 = &rec->cr_fid;
+ r->ur_fid2 = &rec->cr_replayfid;
r->ur_mode = NTOH__u32(rec->cr_mode);
r->ur_rdev = NTOH__u64(rec->cr_rdev);
r->ur_uid = NTOH__u32(rec->cr_uid);
r->ur_name = lustre_msg_buf(req->rq_reqmsg, offset + 1);
r->ur_namelen = req->rq_reqmsg->buflens[offset + 1];
- if (req->rq_reqmsg->bufcount == offset + 3) {
+ if (req->rq_reqmsg->bufcount == offset + 3) {
r->ur_tgt = lustre_msg_buf(req->rq_reqmsg, offset + 2);
r->ur_tgtlen = req->rq_reqmsg->buflens[offset + 2];
- } else {
+ } else {
r->ur_tgt = NULL;
r->ur_tgtlen = 0;
}
r->ur_fsuid = NTOH__u32(rec->lk_fsuid);
r->ur_fsgid = NTOH__u32(rec->lk_fsgid);
+ r->ur_cap = NTOH__u32(rec->lk_cap);
r->ur_fid1 = &rec->lk_fid1;
r->ur_fid2 = &rec->lk_fid2;
r->ur_fsuid = NTOH__u32(rec->ul_fsuid);
r->ur_fsgid = NTOH__u32(rec->ul_fsgid);
+ r->ur_cap = NTOH__u32(rec->ul_cap);
r->ur_mode = NTOH__u32(rec->ul_mode);
r->ur_fid1 = &rec->ul_fid1;
r->ur_fid2 = &rec->ul_fid2;
r->ur_fsuid = NTOH__u32(rec->rn_fsuid);
r->ur_fsgid = NTOH__u32(rec->rn_fsgid);
+ r->ur_cap = NTOH__u32(rec->rn_cap);
r->ur_fid1 = &rec->rn_fid1;
r->ur_fid2 = &rec->rn_fid2;
[REINT_LINK] mds_link_unpack,
[REINT_UNLINK] mds_unlink_unpack,
[REINT_RENAME] mds_rename_unpack,
- [REINT_RECREATE] mds_create_unpack,
};
int mds_update_unpack(struct ptlrpc_request *req, int offset,
struct mds_update_record *rec)
{
__u32 *opcode = lustre_msg_buf(req->rq_reqmsg, offset);
- int rc;
+ int rc, realop;
ENTRY;
if (!opcode || req->rq_reqmsg->buflens[offset] < sizeof(*opcode))
RETURN(-EFAULT);
- rec->ur_opcode = NTOH__u32(*opcode);
+ realop = rec->ur_opcode = NTOH__u32(*opcode);
+ realop &= REINT_OPCODE_MASK;
- if (rec->ur_opcode < 0 || rec->ur_opcode > REINT_MAX)
+ if (realop < 0 || realop > REINT_MAX)
RETURN(-EFAULT);
- rc = mds_unpackers[rec->ur_opcode](req, offset, rec);
+ rc = mds_unpackers[realop](req, offset, rec);
RETURN(rc);
}