fix function declaration and calls due to lockh remove

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 91a490c..cb66391 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -308,7 +308,7 @@ static int mdt_reint(struct mdt_thread_info *info,
                                info->mti_rep_buf_size, NULL);
         if (rc)
                 RETURN(rc);
-        rc = mdt_reint_internal(info, req, offset, NULL);
+        rc = mdt_reint_internal(info, req, offset);
         RETURN(rc);
 }
 

diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h
index 50f5e3b..47e34fa 100644 (file)
--- a/lustre/mdt/mdt_internal.h
+++ b/lustre/mdt/mdt_internal.h
@@ -201,8 +201,7 @@ int mdt_reint_unpack(struct mdt_thread_info *,
                      struct ptlrpc_request *, 
                      int);
 
-int mdt_reint_rec(struct mdt_thread_info *,
-                  struct mdt_lock_handle *);
+int mdt_reint_rec(struct mdt_thread_info *);
 
 #endif /* __KERNEL__ */
 #endif /* _MDT_H */

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 0125514..beb2a22 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -139,8 +139,7 @@ static int mdt_reint_open(struct mdt_thread_info *info)
 }
 
 
-typedef int (*mdt_reinter)(struct mdt_thread_info *info,
-                           struct mdt_lock_handle *);
+typedef int (*mdt_reinter)(struct mdt_thread_info *info);
 
 static mdt_reinter reinters[REINT_MAX] = {
         [REINT_SETATTR]  = mdt_reint_setattr,