- using cobj in mdd_may_delete(), pobj may be NULL.

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 9ab73b0..7cf8db2 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -608,7 +608,7 @@ static int mdd_may_delete(const struct lu_env *env,
                           struct mdd_object *cobj,
                           int is_dir, int need_check)
 {
-        struct mdd_device *mdd = mdo2mdd(&pobj->mod_obj);
+        struct mdd_device *mdd = mdo2mdd(&cobj->mod_obj);
         int rc = 0;
         ENTRY;
 

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 4345416..c8eb995 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -1452,7 +1452,7 @@ static int mdt_body_unpack(struct mdt_thread_info *info, __u32 flags)
         }
 
         /*
-         * Dot not get size or any capa fields before we check that request
+         * Do not get size or any capa fields before we check that request
          * contains capa actually. There are some requests which do not, for
          * instance MDS_IS_SUBDIR.
          */