(1) remove compile error in mdd

(2) remove OBD_MD_FLFLAGS flag because it is not set by OSD;

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 6493d44..eebc99a 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -60,6 +60,13 @@ static void __mdd_ref_del(const struct lu_context *ctxt, struct mdd_object *obj,
                           struct thandle *handle);
 static int mdd_lookup(const struct lu_context *ctxt, struct md_object *pobj,
                       const char *name, struct lu_fid* fid);
+
+static inline const struct lu_fid *mdo2fid(const struct mdd_object *obj)
+{
+        return lu_object_fid(&obj->mod_obj.mo_lu);
+}
+
+
 static struct md_object_operations mdd_obj_ops;
 static struct md_dir_operations    mdd_dir_ops;
 static struct lu_object_operations mdd_lu_obj_ops;
@@ -657,7 +664,7 @@ static int mdd_may_delete(const struct lu_context *ctxt,
                 if (!S_ISDIR(cla->la_mode))
                         RETURN(-ENOTDIR);
 
-                if (lu_fid_eq(mdd2_lu_fid(cobj), 
+                if (lu_fid_eq(mdo2fid(cobj), 
                                         &mdd->mdd_root_fid))
                         RETURN(-EBUSY);
                 
@@ -811,11 +818,6 @@ static int mdd_parent_fid(const struct lu_context *ctxt,
         return rc;
 }
 
-static inline const struct lu_fid *mdo2fid(const struct mdd_object *obj)
-{
-        return lu_object_fid(&obj->mod_obj.mo_lu);
-}
-
 static int mdd_is_parent(const struct lu_context *ctxt,
                          struct mdd_device *mdd,
                          struct mdd_object *p1,

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 0715451..40d62f0 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -171,9 +171,9 @@ static int mdt_statfs(struct mdt_thread_info *info)
 void mdt_pack_attr2body(struct mdt_body *b, const struct lu_attr *attr,
                         const struct lu_fid *fid)
 {
-        b->valid |= OBD_MD_FLCTIME | OBD_MD_FLUID |
-                    OBD_MD_FLGID | OBD_MD_FLFLAGS | OBD_MD_FLTYPE |
-                    OBD_MD_FLMODE | OBD_MD_FLNLINK | OBD_MD_FLGENER;
+        b->valid |= OBD_MD_FLCTIME | OBD_MD_FLUID   |
+                    OBD_MD_FLGID   | OBD_MD_FLTYPE  |
+                    OBD_MD_FLMODE  | OBD_MD_FLNLINK | OBD_MD_FLGENER;
 
         if (!S_ISREG(attr->la_mode))
                 b->valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLATIME |

diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c
index 5b635e4..c2c3f55 100644 (file)
--- a/lustre/mdt/mdt_lib.c
+++ b/lustre/mdt/mdt_lib.c
@@ -311,7 +311,6 @@ static int mdt_open_unpack(struct mdt_thread_info *info)
                 attr->la_ctime = rec->cr_time;
                 attr->la_mtime = rec->cr_time;
                 attr->la_atime = rec->cr_time;
-
                 rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
                 if (rr->rr_name == NULL)
                         /*XXX: what about open by FID? */