b=24360 fix NULL pointer deref in mds_verify_child() when ll_lookup_one_len() fails

i=johann

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a16d95e..7354b2d 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -85,6 +85,10 @@ Severity   : normal
 Bugzilla   : 22660
 Description: lustre grants flock exclusive locks to two fd's in the same process
 
+Severity   : normal
+Bugzilla   : 24360
+Description: LBUG in the mfs_verify_child()
+
 -------------------------------------------------------------------------------
 
 2010-10-29 Oracle, Inc.

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 66a4487..2568220 100644 (file)
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -1500,7 +1500,7 @@ static int mds_verify_child(struct obd_device *obd,
                             struct ldlm_res_id *maxres)
 {
         struct dentry *vchild, *dchild = *dchildp;
-        int rc = 0, cleanup_phase = 2; /* parent, child locks */
+        int rc = 0, cleanup_phase = child_lockh == NULL ? 1:2; /* parent, child locks */
         ENTRY;
 
         /* not want child - not check it */