b=7267,7034

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

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 7658bc5..901e4a1 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -50,28 +50,15 @@ void mdc_readdir_pack(struct ptlrpc_request *req, int req_offset,
         b->nlink = size;                        /* !! */
 }
 
-static __u32 mds_pack_open_flags(__u32 flags)
-{
-        return
-                (flags & (FMODE_READ | FMODE_WRITE | FMODE_EXEC |
-                          MDS_OPEN_DELAY_CREATE | MDS_OPEN_HAS_EA |
-                          MDS_OPEN_HAS_OBJS)) |
-                ((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 lustre_msg *msg, int offset,
-                   struct mdc_op_data *op_data, __u32 mode, __u64 rdev,
-                   __u32 flags, const void *lmm, int lmmlen)
+                   struct mdc_op_data *op_data, __u32 mode,
+                   __u64 rdev, __u32 flags, const void *lmm,
+                   int lmmlen, void *key, int keylen)
 {
         struct mds_rec_create *rec;
         char *tmp;
+        
         rec = lustre_msg_buf(msg, offset, sizeof (*rec));
 
         /* XXX do something about time, uid, gid */
@@ -79,10 +66,10 @@ void mdc_open_pack(struct lustre_msg *msg, int offset,
         if (op_data != NULL)
                 rec->cr_id = op_data->id1;
         memset(&rec->cr_replayid, 0, sizeof(rec->cr_replayid));
-        rec->cr_mode = mode;
         rec->cr_flags = mds_pack_open_flags(flags);
-        rec->cr_rdev = rdev;
         rec->cr_time = op_data->mod_time;
+        rec->cr_mode = mode;
+        rec->cr_rdev = rdev;
 
         if (op_data->name) {
                 tmp = lustre_msg_buf(msg, offset + 1,
@@ -95,10 +82,15 @@ void mdc_open_pack(struct lustre_msg *msg, int offset,
                 tmp = lustre_msg_buf(msg, offset + 2, lmmlen);
                 memcpy (tmp, lmm, lmmlen);
         }
+        if (key) {
+                rec->cr_flags |= MDS_OPEN_HAS_KEY;
+                tmp = lustre_msg_buf(msg, offset + 3, keylen);
+                memcpy(tmp, key, keylen); 
+        }
 }
 
-void mdc_getattr_pack(struct lustre_msg *msg, int offset, int valid,
-                      int flags, struct mdc_op_data *data)
+void mdc_getattr_pack(struct lustre_msg *msg, int offset,
+                      __u64 valid, int flags, struct mdc_op_data *data)
 {
         struct mds_body *b;
         b = lustre_msg_buf(msg, offset, sizeof (*b));
@@ -117,12 +109,12 @@ void mdc_getattr_pack(struct lustre_msg *msg, int offset, int valid,
 }
 
 void mdc_close_pack(struct ptlrpc_request *req, int offset, struct obdo *oa,
-                    int valid, struct obd_client_handle *och)
+                    __u64 valid, struct obd_client_handle *och)
 {
         struct mds_body *body;
 
         body = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*body));
-        mdc_pack_id(&body->id1, oa->o_id, 0, oa->o_mode, 0, 0);
+        mdc_pack_id(&body->id1, oa->o_id, oa->o_generation, oa->o_mode, 0, 0);
 
         memcpy(&body->handle, &och->och_fh, sizeof(body->handle));
         if (oa->o_valid & OBD_MD_FLATIME) {
@@ -149,4 +141,33 @@ void mdc_close_pack(struct ptlrpc_request *req, int offset, struct obdo *oa,
                 body->flags = oa->o_flags;
                 body->valid |= OBD_MD_FLFLAGS;
         }
+        if (oa->o_valid & OBD_MD_FLEPOCH) {
+                body->io_epoch = oa->o_easize;
+                body->valid |= OBD_MD_FLEPOCH;
+        }
 }
+
+/* 
+ * these methods needed for saying higher levels that MDC does not pack/unpack
+ * any EAs. This is needed to have real abstraction and do not try to recognize
+ * what OBD type is to avoid calling these methods on it, as they may not be
+ * implemented.
+ *
+ * Sometimes pack/unpack calls happen to MDC too. This is for instance default
+ * striping info for directories and our goal here is to skip them with no
+ * errors or any complains.
+ */
+int mdc_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
+               struct lov_stripe_md *lsm)
+{
+        ENTRY;
+        RETURN(0);
+}
+
+int mdc_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
+                 struct lov_mds_md *lmm, int lmm_size)
+{
+        ENTRY;
+        RETURN(0);
+}
+