b=278

More merging from b_eq, including the removal of ptlrpc_request->rq_obd

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 6e2c1ca..ad2c966 100644 (file)
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -974,18 +974,14 @@ char *portals_debug_dumpstack(void)
         return buf;
 }
 
-#elif defined(CONFIG_X86)
+#elif defined(__i386__)
 
 extern int is_kernel_text_address(unsigned long addr);
 extern int lookup_symbol(unsigned long address, char *buf, int buflen);
 
 char *portals_debug_dumpstack(void)
 {
-#if defined(__x86_64__)
-        unsigned long esp = current->thread.rsp;
-#else
         unsigned long esp = current->thread.esp;
-#endif
         unsigned long *stack = (unsigned long *)&esp;
         int size;
         unsigned long addr;

diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
index 8dc312e..abd0f2e 100644 (file)
--- a/lustre/ldlm/ldlm_internal.h
+++ b/lustre/ldlm/ldlm_internal.h
@@ -46,6 +46,6 @@ struct ldlm_state {
         struct ldlm_bl_pool *ldlm_bl_pool;
 };
 
-int __init ldlm_init(void);
-void __exit ldlm_exit(void);
+int ldlm_init(void);
+void ldlm_exit(void);
 

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 2d2196a..9245d91 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1006,7 +1006,7 @@ static void ptlrpc_abort_reply (struct ptlrpc_request *req)
                  * has finished.  Note that if the ACK does arrive, its
                  * callback wakes us in short order. --eeb */
                 lwi = LWI_TIMEOUT (HZ/4, NULL, NULL);
-                rc = l_wait_event(req->rq_wait_for_rep, !req->rq_want_ack,
+                rc = l_wait_event(req->rq_reply_waitq, !req->rq_want_ack,
                                   &lwi);
                 CDEBUG (D_HA, "Retrying req %p: %d\n", req, rc);
                 /* NB go back and test rq_want_ack with locking, to ensure
@@ -1062,7 +1062,7 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
                         OBD_FREE(req->rq_repmsg, req->rq_replen);
                         req->rq_repmsg = NULL;
                 }
-                init_waitqueue_head(&req->rq_wait_for_rep);
+                init_waitqueue_head(&req->rq_reply_waitq);
                 netrc = 0;
         }
 
@@ -1076,7 +1076,7 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
 
         init_waitqueue_entry(&commit_wait, current);
         add_wait_queue(&obd->obd_commit_waitq, &commit_wait);
-        rc = l_wait_event(req->rq_wait_for_rep,
+        rc = l_wait_event(req->rq_reply_waitq,
                           !req->rq_want_ack || req->rq_resent ||
                           req->rq_transno <= obd->obd_last_committed, &lwi);
         remove_wait_queue(&obd->obd_commit_waitq, &commit_wait);

diff --git a/lustre/portals/libcfs/debug.c b/lustre/portals/libcfs/debug.c
index 6e2c1ca..ad2c966 100644 (file)
--- a/lustre/portals/libcfs/debug.c
+++ b/lustre/portals/libcfs/debug.c
@@ -974,18 +974,14 @@ char *portals_debug_dumpstack(void)
         return buf;
 }
 
-#elif defined(CONFIG_X86)
+#elif defined(__i386__)
 
 extern int is_kernel_text_address(unsigned long addr);
 extern int lookup_symbol(unsigned long address, char *buf, int buflen);
 
 char *portals_debug_dumpstack(void)
 {
-#if defined(__x86_64__)
-        unsigned long esp = current->thread.rsp;
-#else
         unsigned long esp = current->thread.esp;
-#endif
         unsigned long *stack = (unsigned long *)&esp;
         int size;
         unsigned long addr;