- documentation updates for the collaborative cache

- NAL document with beginning of I/B NAL design
- all MDS requests have an fsuid and fsgid now to start permission
  checking on the MDS.

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index 8dd5c6c..ddd568d 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -333,6 +333,8 @@ struct mds_conn_status {
 };
 
 struct mds_body {
+        __u32          fsuid;
+        __u32          fsgid;
         struct ll_fid  fid1;
         struct ll_fid  fid2;
         __u64          size;
@@ -362,6 +364,8 @@ struct mds_body {
 
 struct mds_rec_setattr {
         __u32           sa_opcode;
+        __u32           sa_fsuid;
+        __u32           sa_fsgid;
         __u32           sa_valid;
         struct ll_fid   sa_fid;
         __u32           sa_mode;
@@ -376,6 +380,8 @@ struct mds_rec_setattr {
 
 struct mds_rec_create {
         __u32           cr_opcode;
+        __u32           cr_fsuid;
+        __u32           cr_fsgid;
         __u32           cr_mode;
         struct ll_fid   cr_fid;
         __u32           cr_uid;
@@ -386,6 +392,8 @@ struct mds_rec_create {
 
 struct mds_rec_link {
         __u32           lk_opcode;
+        __u32           lk_fsuid;
+        __u32           lk_fsgid;
         __u32           lk_reserved;
         struct ll_fid   lk_fid1;
         struct ll_fid   lk_fid2;
@@ -393,6 +401,8 @@ struct mds_rec_link {
 
 struct mds_rec_unlink {
         __u32           ul_opcode;
+        __u32           ul_fsuid;
+        __u32           ul_fsgid;
         __u32           ul_mode;
         struct ll_fid   ul_fid1;
         struct ll_fid   ul_fid2;
@@ -400,6 +410,8 @@ struct mds_rec_unlink {
 
 struct mds_rec_rename {
         __u32           rn_opcode;
+        __u32           rn_fsuid;
+        __u32           rn_fsgid;
         __u32           rn_reserved;
         struct ll_fid   rn_fid1;
         struct ll_fid   rn_fid2;

diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 78a9004..fd22b23 100644 (file)
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -44,6 +44,8 @@ struct obd_device;
 #define LUSTRE_MDC_NAME "mdc"
 
 struct mds_update_record {
+        __u32 ur_fsuid;
+        __u32 ur_fsgid;
         __u32 ur_opcode;
         struct ll_fid *ur_fid1;
         struct ll_fid *ur_fid2;

diff --git a/lustre/lib/mds_updates.c b/lustre/lib/mds_updates.c
index 062a7e7..b820e57 100644 (file)
--- a/lustre/lib/mds_updates.c
+++ b/lustre/lib/mds_updates.c
@@ -78,6 +78,9 @@ static void mds_pack_body(struct mds_body *b)
         if (b == NULL)
                 LBUG();
 
+        b->fsuid = HTON__u32(current->fsuid);
+        b->fsgid = HTON__u32(current->fsgid);
+
         mds_pack_fid(&b->fid1);
         mds_pack_fid(&b->fid2);
         b->extra = HTON__u64(b->extra);
@@ -138,6 +141,8 @@ void mds_create_pack(struct ptlrpc_request *req, int offset,
 
         /* XXX do something about time, uid, gid */
         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_mode = HTON__u32(mode);
         rec->cr_rdev = HTON__u64(rdev);
@@ -162,6 +167,8 @@ void mds_setattr_pack(struct ptlrpc_request *req, int offset,
         rec = lustre_msg_buf(req->rq_reqmsg, offset);
 
         rec->sa_opcode = HTON__u32(REINT_SETATTR);
+        rec->sa_fsuid = HTON__u32(current->fsuid);
+        rec->sa_fsgid = HTON__u32(current->fsgid);
         ll_inode2fid(&rec->sa_fid, inode);
         rec->sa_valid = HTON__u32(iattr->ia_valid);
         rec->sa_mode = HTON__u32(iattr->ia_mode);
@@ -190,6 +197,8 @@ void mds_unlink_pack(struct ptlrpc_request *req, int offset,
         rec = lustre_msg_buf(req->rq_reqmsg, offset);
 
         rec->ul_opcode = HTON__u32(REINT_UNLINK);
+        rec->ul_fsuid = HTON__u32(current->fsuid);
+        rec->ul_fsgid = HTON__u32(current->fsgid);
         rec->ul_mode = HTON__u32(mode);
         ll_inode2fid(&rec->ul_fid1, inode);
         if (child)
@@ -209,6 +218,8 @@ void mds_link_pack(struct ptlrpc_request *req, int offset,
         rec = lustre_msg_buf(req->rq_reqmsg, offset);
 
         rec->lk_opcode = HTON__u32(REINT_LINK);
+        rec->lk_fsuid = HTON__u32(current->fsuid);
+        rec->lk_fsgid = HTON__u32(current->fsgid);
         ll_inode2fid(&rec->lk_fid1, inode);
         ll_inode2fid(&rec->lk_fid2, dir);
 
@@ -227,6 +238,8 @@ void mds_rename_pack(struct ptlrpc_request *req, int offset,
 
         /* XXX do something about time, uid, gid */
         rec->rn_opcode = HTON__u32(REINT_RENAME);
+        rec->rn_fsuid = HTON__u32(current->fsuid);
+        rec->rn_fsgid = HTON__u32(current->fsgid);
         ll_inode2fid(&rec->rn_fid1, srcdir);
         ll_inode2fid(&rec->rn_fid2, tgtdir);
 
@@ -252,6 +265,8 @@ void mds_unpack_body(struct mds_body *b)
         if (b == NULL)
                 LBUG();
 
+        b->fsuid = NTOH__u32(b->fsuid);
+        b->fsgid = NTOH__u32(b->fsgid);
         mds_unpack_fid(&b->fid1);
         mds_unpack_fid(&b->fid2);
         b->extra = NTOH__u64(b->extra);
@@ -282,6 +297,8 @@ static int mds_setattr_unpack(struct ptlrpc_request *req, int offset,
             req->rq_reqmsg->buflens[offset] != sizeof(*rec))
                 RETURN(-EFAULT);
 
+        r->ur_fsuid = NTOH__u32(rec->sa_fsuid);
+        r->ur_fsgid = NTOH__u32(rec->sa_fsgid);
         r->ur_fid1 = &rec->sa_fid;
         attr->ia_valid = NTOH__u32(rec->sa_valid);
         attr->ia_mode = NTOH__u32(rec->sa_mode);
@@ -312,6 +329,8 @@ static int mds_create_unpack(struct ptlrpc_request *req, int offset,
             req->rq_reqmsg->buflens[offset] != sizeof(*rec))
                 RETURN(-EFAULT);
 
+        r->ur_fsuid = NTOH__u32(rec->cr_fsuid);
+        r->ur_fsgid = NTOH__u32(rec->cr_fsgid);
         r->ur_fid1 = &rec->cr_fid;
         r->ur_mode = NTOH__u32(rec->cr_mode);
         r->ur_rdev = NTOH__u64(rec->cr_rdev);
@@ -337,6 +356,8 @@ static int mds_link_unpack(struct ptlrpc_request *req, int offset,
             req->rq_reqmsg->buflens[offset] != sizeof(*rec))
                 RETURN(-EFAULT);
 
+        r->ur_fsuid = NTOH__u32(rec->lk_fsuid);
+        r->ur_fsgid = NTOH__u32(rec->lk_fsgid);
         r->ur_fid1 = &rec->lk_fid1;
         r->ur_fid2 = &rec->lk_fid2;
 
@@ -355,6 +376,8 @@ static int mds_unlink_unpack(struct ptlrpc_request *req, int offset,
             req->rq_reqmsg->buflens[offset] != sizeof(*rec))
                 RETURN(-EFAULT);
 
+        r->ur_fsuid = NTOH__u32(rec->ul_fsuid);
+        r->ur_fsgid = NTOH__u32(rec->ul_fsgid);
         r->ur_mode = NTOH__u32(rec->ul_mode);
         r->ur_fid1 = &rec->ul_fid1;
         r->ur_fid2 = &rec->ul_fid2;
@@ -374,6 +397,8 @@ static int mds_rename_unpack(struct ptlrpc_request *req, int offset,
             req->rq_reqmsg->buflens[offset] != sizeof(*rec))
                 RETURN(-EFAULT);
 
+        r->ur_fsuid = NTOH__u32(rec->rn_fsuid);
+        r->ur_fsgid = NTOH__u32(rec->rn_fsgid);
         r->ur_fid1 = &rec->rn_fid1;
         r->ur_fid2 = &rec->rn_fid2;
 

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index bbf9a6f..4b2ab91 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -125,6 +125,7 @@ int mdc_getattr(struct lustre_handle *conn,
         body = lustre_msg_buf(req->rq_reqmsg, 0);
         ll_ino2fid(&body->fid1, ino, 0, type);
         body->valid = valid;
+        mds_pack_req_body(req); 
 
         if (S_ISREG(type)) {
                 struct client_obd *mdc = &class_conn2obd(conn)->u.cli;

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index ef67119..981498c 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -20,6 +20,8 @@
 #define DEBUG_SUBSYSTEM S_OSC
 
 #include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/highmem.h>
 #include <linux/lustre_dlm.h>
 #include <linux/lustre_mds.h> /* for mds_objid */
 #include <linux/obd_ost.h>