Fix one build error, one build warning, and one extremely scary

never-should-have-worked build warning.

diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h
index 455af80..a09b742 100644 (file)
--- a/lustre/include/linux/lustre_dlm.h
+++ b/lustre/include/linux/lustre_dlm.h
@@ -193,8 +193,7 @@ do {                                                            \
 } while (0)
 
 #define LDLM_DEBUG_NOLOCK(format, a...)                 \
-        CDEBUG(D_DLMTRACE, "### " format "\n" , ## a);
-
+        CDEBUG(D_DLMTRACE, "### " format "\n" , ## a)
 
 /* ldlm_extent.c */
 int ldlm_extent_compat(struct ldlm_lock *, struct ldlm_lock *);

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index c420a58..bc18121 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -109,9 +109,10 @@ int ll_lock(struct inode *dir, struct dentry *dentry,
                 err = mdc_enqueue(&sbi->ll_mdc_conn, LDLM_MDSINTENT,
                                   it, LCK_PR, dir, dentry, lockh, 0, NULL, 0,
                                   dir, sizeof(*dir));
-
-        else
+        else {
                 LBUG();
+                RETURN(-1);
+        }
 
         RETURN(err);
 }
@@ -193,6 +194,7 @@ static struct dentry *ll_lookup2(struct inode * dir, struct dentry *dentry,
                 request = (struct ptlrpc_request *)it->it_data;
                 body = lustre_msg_buf(request->rq_repmsg, 1);
                 type = body->mode;
+                ino = body->fid1.id;
         }
 
         if (S_ISREG(type)) {