Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
land v0.9.1 on HEAD, in preparation for a 1.0.x branch
[fs/lustre-release.git] / lustre / mdc / mdc_lib.c
diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index a17f7a1..0de8ad7 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -21,15 +21,23 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 #ifndef __KERNEL__
+# include <fcntl.h>
 # include <liblustre.h>
 #endif
 #include <linux/lustre_idl.h>
 #include <linux/lustre_net.h>
 #include <linux/lustre_mds.h>
-#include <linux/lustre_lite.h>
+#include "mdc_internal.h"
+
+#ifndef __KERNEL__
+/* some liblustre hackings here */
+#ifndef O_DIRECTORY
+#define O_DIRECTORY     0
+#endif
+#endif
 
 void mdc_readdir_pack(struct ptlrpc_request *req, __u64 offset, __u32 size,
-                      obd_id ino, int type, __u64 xid)
+                      struct ll_fid *mdc_fid)
 {
         struct mds_body *b;
 
@@ -37,11 +45,9 @@ void mdc_readdir_pack(struct ptlrpc_request *req, __u64 offset, __u32 size,
         b->fsuid = current->fsuid;
         b->fsgid = current->fsgid;
         b->capability = current->cap_effective;
-        b->fid1.id = ino;
-        b->fid1.f_type = type;
+        b->fid1 = *mdc_fid;
         b->size = offset;                       /* !! */
         b->suppgid = -1;
-        b->blocks = xid;                        /* !! */
         b->nlink = size;                        /* !! */
 }
 
@@ -62,8 +68,7 @@ void mdc_pack_req_body(struct ptlrpc_request *req)
 
 /* packing of MDS records */
 void mdc_create_pack(struct ptlrpc_request *req, int offset,
-                     struct mdc_op_data *op_data,
-                     __u32 mode, __u64 rdev, __u32 uid, __u32 gid, __u64 time,
+                     struct mdc_op_data *op_data, __u32 mode, __u64 rdev,
                      const void *data, int datalen)
 {
         struct mds_rec_create *rec;
@@ -74,17 +79,12 @@ void mdc_create_pack(struct ptlrpc_request *req, int offset,
         rec->cr_fsuid = current->fsuid;
         rec->cr_fsgid = current->fsgid;
         rec->cr_cap = current->cap_effective;
-        ll_ino2fid(&rec->cr_fid, op_data->ino1, op_data->gen1, op_data->typ1);
+        rec->cr_fid = op_data->fid1;
         memset(&rec->cr_replayfid, 0, sizeof(rec->cr_replayfid));
         rec->cr_mode = mode;
         rec->cr_rdev = rdev;
-        rec->cr_uid = uid;
-        rec->cr_gid = gid;
-        rec->cr_time = time;
-        if (in_group_p(op_data->gid1))
-                rec->cr_suppgid = op_data->gid1;
-        else
-                rec->cr_suppgid = -1;
+        rec->cr_time = op_data->mod_time;
+        rec->cr_suppgid = op_data->ctxt.gid1;
 
         tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1, op_data->namelen + 1);
         LOGL0(op_data->name, op_data->namelen, tmp);
@@ -95,11 +95,24 @@ void mdc_create_pack(struct ptlrpc_request *req, int offset,
         }
 }
 
+static __u32 mds_pack_open_flags(__u32 flags)
+{
+        return
+                (flags & (FMODE_READ | FMODE_WRITE | FMODE_EXEC |
+                          MDS_OPEN_DELAY_CREATE | MDS_OPEN_HAS_EA)) |
+                ((flags & O_CREAT) ? MDS_OPEN_CREAT : 0) |
+                ((flags & O_EXCL) ? MDS_OPEN_EXCL : 0) |
+                ((flags & O_TRUNC) ? MDS_OPEN_TRUNC : 0) |
+                ((flags & O_APPEND) ? MDS_OPEN_APPEND : 0) |
+                ((flags & O_SYNC) ? MDS_OPEN_SYNC : 0) |
+                ((flags & O_DIRECTORY) ? MDS_OPEN_DIRECTORY : 0) |
+                0;
+}
+
 /* packing of MDS records */
 void mdc_open_pack(struct ptlrpc_request *req, int offset,
-                   struct mdc_op_data *op_data,
-                   __u32 mode, __u64 rdev, __u32 uid, __u32 gid, __u64 time,
-                   __u32 flags, const void *data, int datalen)
+                   struct mdc_op_data *op_data, __u32 mode, __u64 rdev,
+                   __u32 flags, const void *lmm, int lmmlen)
 {
         struct mds_rec_create *rec;
         char *tmp;
@@ -111,19 +124,13 @@ void mdc_open_pack(struct ptlrpc_request *req, int offset,
         rec->cr_fsgid = current->fsgid;
         rec->cr_cap = current->cap_effective;
         if (op_data != NULL)
-                ll_ino2fid(&rec->cr_fid, op_data->ino1,
-                           op_data->gen1, op_data->typ1);
+                rec->cr_fid = op_data->fid1;
         memset(&rec->cr_replayfid, 0, sizeof(rec->cr_replayfid));
         rec->cr_mode = mode;
-        rec->cr_flags = flags;
+        rec->cr_flags = mds_pack_open_flags(flags);
         rec->cr_rdev = rdev;
-        rec->cr_uid = uid;
-        rec->cr_gid = gid;
-        rec->cr_time = time;
-        if (in_group_p(op_data->gid1))
-                rec->cr_suppgid = op_data->gid1;
-        else
-                rec->cr_suppgid = -1;
+        rec->cr_time = op_data->mod_time;
+        rec->cr_suppgid = op_data->ctxt.gid1;
 
         if (op_data->name) {
                 tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1,
@@ -131,14 +138,14 @@ void mdc_open_pack(struct ptlrpc_request *req, int offset,
                 LOGL0(op_data->name, op_data->namelen, tmp);
         }
 
-        if (data) {
-                tmp = lustre_msg_buf(req->rq_reqmsg, offset + 2, datalen);
-                memcpy (tmp, data, datalen);
+        if (lmm) {
+                rec->cr_flags |= MDS_OPEN_HAS_EA;
+                tmp = lustre_msg_buf(req->rq_reqmsg, offset + 2, lmmlen);
+                memcpy (tmp, lmm, lmmlen);
         }
 }
 
-void mdc_setattr_pack(struct ptlrpc_request *req,
-                      struct mdc_op_data *data,
+void mdc_setattr_pack(struct ptlrpc_request *req, struct mdc_op_data *data,
                       struct iattr *iattr, void *ea, int ealen,
                       void *ea2, int ea2len)
 {
@@ -148,7 +155,7 @@ void mdc_setattr_pack(struct ptlrpc_request *req,
         rec->sa_fsuid = current->fsuid;
         rec->sa_fsgid = current->fsgid;
         rec->sa_cap = current->cap_effective;
-        ll_ino2fid(&rec->sa_fid, data->ino1, data->gen1, data->typ1);
+        rec->sa_fid = data->fid1;
 
         if (iattr) {
                 rec->sa_valid = iattr->ia_valid;
@@ -160,14 +167,14 @@ void mdc_setattr_pack(struct ptlrpc_request *req,
                 rec->sa_mtime = LTIME_S(iattr->ia_mtime);
                 rec->sa_ctime = LTIME_S(iattr->ia_ctime);
                 rec->sa_attr_flags = iattr->ia_attr_flags;
-
                 if ((iattr->ia_valid & ATTR_GID) && in_group_p(iattr->ia_gid))
                         rec->sa_suppgid = iattr->ia_gid;
                 else if ((iattr->ia_valid & ATTR_MODE) &&
-                         in_group_p(data->gid1))
-                        rec->sa_suppgid = data->gid1;
-                else
-                        rec->sa_suppgid = -1;
+                         in_group_p(iattr->ia_gid))
+                        rec->sa_suppgid = data->ctxt.gid1;
+                else if ((iattr->ia_valid & (ATTR_MTIME|ATTR_CTIME)) &&
+                         data->ctxt.gid1 != -1)
+                        rec->sa_suppgid = data->ctxt.gid1;
         }
 
         if (ealen == 0)
@@ -194,14 +201,11 @@ void mdc_unlink_pack(struct ptlrpc_request *req, int offset,
         rec->ul_fsuid = current->fsuid;
         rec->ul_fsgid = current->fsgid;
         rec->ul_cap = current->cap_effective;
-        rec->ul_mode = data->mode;
-        if (in_group_p(data->gid1))
-                rec->ul_suppgid = data->gid1;
-        else
-                rec->ul_suppgid = -1;
-        ll_ino2fid(&rec->ul_fid1, data->ino1, data->gen1, data->typ1);
-        if (data->ino2)
-                ll_ino2fid(&rec->ul_fid2, data->ino2, data->gen2, data->typ2);
+        rec->ul_mode = data->create_mode;
+        rec->ul_suppgid = data->ctxt.gid1;
+        rec->ul_fid1 = data->fid1;
+        rec->ul_fid2 = data->fid2;
+        rec->ul_time = data->mod_time;
 
         tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1, data->namelen + 1);
         LASSERT (tmp != NULL);
@@ -220,16 +224,11 @@ void mdc_link_pack(struct ptlrpc_request *req, int offset,
         rec->lk_fsuid = current->fsuid;
         rec->lk_fsgid = current->fsgid;
         rec->lk_cap = current->cap_effective;
-        if (in_group_p(data->gid1))
-                rec->lk_suppgid1 = data->gid1;
-        else
-                rec->lk_suppgid1 = -1;
-        if (in_group_p(data->gid2))
-                rec->lk_suppgid2 = data->gid2;
-        else
-                rec->lk_suppgid2 = -1;
-        ll_ino2fid(&rec->lk_fid1, data->ino1, data->gen1, data->typ1);
-        ll_ino2fid(&rec->lk_fid2, data->ino2, data->gen2, data->typ2);
+        rec->lk_suppgid1 = data->ctxt.gid1;
+        rec->lk_suppgid2 = data->ctxt.gid2;
+        rec->lk_fid1 = data->fid1;
+        rec->lk_fid2 = data->fid2;
+        rec->lk_time = data->mod_time;
 
         tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1, data->namelen + 1);
         LOGL0(data->name, data->namelen, tmp);
@@ -249,16 +248,17 @@ void mdc_rename_pack(struct ptlrpc_request *req, int offset,
         rec->rn_fsuid = current->fsuid;
         rec->rn_fsgid = current->fsgid;
         rec->rn_cap = current->cap_effective;
-        if (in_group_p(data->gid1))
-                rec->rn_suppgid1 = data->gid1;
+        if (in_group_p(data->ctxt.gid1))
+                rec->rn_suppgid1 = data->ctxt.gid1;
         else
                 rec->rn_suppgid1 = -1;
-        if (in_group_p(data->gid2))
-                rec->rn_suppgid2 = data->gid2;
+        if (in_group_p(data->ctxt.gid2))
+                rec->rn_suppgid2 = data->ctxt.gid2;
         else
                 rec->rn_suppgid2 = -1;
-        ll_ino2fid(&rec->rn_fid1, data->ino1, data->gen1, data->typ1);
-        ll_ino2fid(&rec->rn_fid2, data->ino2, data->gen2, data->typ2);
+        rec->rn_fid1 = data->fid1;
+        rec->rn_fid2 = data->fid2;
+        rec->rn_time = data->mod_time;
 
         tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1, oldlen + 1);
         LOGL0(old, oldlen, tmp);
@@ -280,12 +280,9 @@ void mdc_getattr_pack(struct ptlrpc_request *req, int valid, int offset,
         b->capability = current->cap_effective;
         b->valid = valid;
         b->flags = flags;
-        if (in_group_p(data->gid1))
-                b->suppgid = data->gid1;
-        else
-                b->suppgid = -1;
+        b->suppgid = data->ctxt.gid1;
 
-        ll_ino2fid(&b->fid1, data->ino1, data->gen1, data->typ1);
+        b->fid1 = data->fid1;
         if (data->name) {
                 char *tmp;
                 tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1,
@@ -293,3 +290,4 @@ void mdc_getattr_pack(struct ptlrpc_request *req, int valid, int offset,
                 LOGL0(data->name, data->namelen, tmp);
         }
 }
+
Lustre primary development and releases