X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fnet_fault.c;h=89b1eb480770ead53f83359b1556fc0ca1885b33;hp=3861a169ee74e1d954e85b2eff11e627ad167ef1;hb=ed052504713d1db49531454a87055b2ee54399f0;hpb=05ad99f1f3a9f85756bf3355505722bb4f20f420

diff --git a/lnet/lnet/net_fault.c b/lnet/lnet/net_fault.c
index 3861a16..89b1eb4 100644
--- a/lnet/lnet/net_fault.c
+++ b/lnet/lnet/net_fault.c
@@ -37,7 +37,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <lnet/lib-lnet.h>
-#include <lnet/lnetctl.h>
+#include <uapi/linux/lnet/lnetctl.h>
 
 #define LNET_MSG_MASK		(LNET_PUT_BIT | LNET_ACK_BIT | \
 				 LNET_GET_BIT | LNET_REPLY_BIT)
@@ -326,11 +326,10 @@ drop_rule_match(struct lnet_drop_rule *rule, lnet_nid_t src,
 			rule->dr_time_base += cfs_time_seconds(attr->u.drop.
 							       da_interval);
 
-			CDEBUG(D_NET, "Drop Rule %s->%s: next drop : "
-				      CFS_TIME_T"\n",
-				      libcfs_nid2str(attr->fa_src),
-				      libcfs_nid2str(attr->fa_dst),
-				      rule->dr_drop_time);
+			CDEBUG(D_NET, "Drop Rule %s->%s: next drop : %ld\n",
+			       libcfs_nid2str(attr->fa_src),
+			       libcfs_nid2str(attr->fa_dst),
+			       rule->dr_drop_time);
 		}
 
 	} else { /* rate based drop */
@@ -496,11 +495,10 @@ delay_rule_match(struct lnet_delay_rule *rule, lnet_nid_t src,
 			rule->dl_time_base += cfs_time_seconds(attr->u.delay.
 							       la_interval);
 
-			CDEBUG(D_NET, "Delay Rule %s->%s: next delay : "
-				      CFS_TIME_T"\n",
-				      libcfs_nid2str(attr->fa_src),
-				      libcfs_nid2str(attr->fa_dst),
-				      rule->dl_delay_time);
+			CDEBUG(D_NET, "Delay Rule %s->%s: next delay : %ld\n",
+			       libcfs_nid2str(attr->fa_src),
+			       libcfs_nid2str(attr->fa_dst),
+			       rule->dl_delay_time);
 		}
 
 	} else { /* rate based delay */
@@ -647,8 +645,9 @@ delayed_msg_process(struct list_head *msg_list, bool drop)
 			}
 		}
 
-		lnet_drop_message(ni, cpt, msg->msg_private, msg->msg_len);
-		lnet_finalize(ni, msg, rc);
+		lnet_drop_message(ni, cpt, msg->msg_private, msg->msg_len,
+				  msg->msg_type);
+		lnet_finalize(msg, rc);
 	}
 }