last compile fixes: WARNING nothing works probably.

diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 4c31297..1c1d600 100644 (file)
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -132,7 +132,7 @@ void mds_pack_inode2body(struct mds_body *body, struct inode *inode);
 
 /* mds/handler.c */
 struct dentry *mds_fid2dentry(struct mds_obd *mds, struct ll_fid *fid, struct vfsmount **mnt);
-int mds_lock_callback(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
+int mds_lock_callback(struct lustre_handle *lockh, struct ldlm_lock_desc *desc,
                       void *data, int data_len, struct ptlrpc_request **req);
 int mds_reint(int offset, struct ptlrpc_request *req);
 

diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 4afe7fb..cfe6f6c 100644 (file)
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -262,7 +262,7 @@ int mds_lock_callback(struct lustre_handle *lockh, struct ldlm_lock_desc *desc,
 {
         ENTRY;
 
-        if (new == NULL) {
+        if (desc == NULL) {
                 /* Completion AST.  Do nothing */
                 RETURN(0);
         }

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index a051f0a..8753fad 100644 (file)
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -539,7 +539,7 @@ out_unlink_de:
         if (!rc) { 
                 lock = lustre_handle2object(&lockh);
                 ldlm_lock_decref(lock, LCK_EX);
-                rc = ldlm_cli_cancel(lockh);
+                rc = ldlm_cli_cancel(&lockh);
                 if (rc < 0)
                         CERROR("failed to cancel child inode lock ino "
                                "%Ld: %d\n", res_id[0], rc);