Branch: b_new_cmd

some cleanup and typo fixes

diff --git a/lustre/cmm/cmm_split.c b/lustre/cmm/cmm_split.c
index a7e9304..061794d 100644 (file)
--- a/lustre/cmm/cmm_split.c
+++ b/lustre/cmm/cmm_split.c
@@ -36,7 +36,7 @@
 #include <obd_class.h>
 #include <lustre_fid.h>
 #include <lustre_mds.h>
-#include <lustre_idl.h>
+#include <lustre/lustre_idl.h>
 #include "cmm_internal.h"
 #include "mdc_internal.h"
 
@@ -45,7 +45,7 @@
 #define CMM_NO_SPLITTABLE       2
 
 enum {
-        SPLIT_SIZE =  12*1024
+        SPLIT_SIZE =  64*1024
 };
 
 static inline struct lu_fid* cmm2_fid(struct cmm_object *obj)
@@ -251,7 +251,7 @@ static int cmm_remove_entries(const struct lu_context *ctx,
 {
         struct lu_dirpage *dp;
         struct lu_dirent  *ent;
-        int rc = 0, i;
+        int rc = 0;
         ENTRY;
 
         kmap(rdpg->rp_pages[0]);
@@ -288,7 +288,7 @@ static int cmm_remove_entries(const struct lu_context *ctx,
         }
         *len = CFS_PAGE_SIZE;
 unmap:
-        kunmap(rdpg->rp_pages[i]);
+        kunmap(rdpg->rp_pages[0]);
         RETURN(rc);
 }
 

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index f16e714..b6da6c9 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -1946,7 +1946,7 @@ static int lmv_reset_hash_seg_end (struct lmv_obd *lmv, struct lmv_obj *obj,
         LASSERT(le32_to_cpu(next_dp->ldp_hash_start) >= seg_end); 
         dp->ldp_hash_end = next_dp->ldp_hash_start;
         kunmap(page);
-        CDEBUG(D_WARNING,"reset h_end %x for split obj"DFID"o_count %d index %d\n",
+        CDEBUG(D_INFO,"reset h_end %x for split obj"DFID"o_count %d index %d\n",
                le32_to_cpu(dp->ldp_hash_end), PFID(&rid), obj->lo_objcount,
                index); 
 cleanup:

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 1482e8b..f12591b 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -870,7 +870,7 @@ static int mdd_attr_set(const struct lu_context *ctxt,
         struct mdd_device *mdd = mdo2mdd(obj);
         struct thandle *handle;
         struct lov_mds_md *lmm = NULL;
-        int  rc = 0, lmm_size = 0, max_size;
+        int  rc = 0, lmm_size = 0, max_size = 0;
         struct lu_attr *la_copy = &mdd_ctx_info(ctxt)->mti_la_for_fix;
         ENTRY;