From 5c3b7f29f5a2b6dd8745fcfa089539d6dfc6b9ca Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 25 Mar 2011 00:35:45 +0100 Subject: [PATCH] --- yaml --- r: 345951 b: refs/heads/master c: 49ba9b1bb3295fa690ae8f5091b093e61acf3ada h: refs/heads/master i: 345949: 0acdd087d26276452e489e481f5ce78b8a3a5549 345947: b7ac55d8bcdeb2136bfb953228b0aed0de39c08f 345943: 25c74e374a84e1b89a73d9a0321045f5a230e85f 345935: aa71bbe731e2a52fb947f2efc59aeb0648ec96c7 345919: 9dc3f127e66572f6d9576ba2c5064d716d7b7d33 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 98b903b82013..891950930d3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deebe195798ef1f19df8c509414d936da8b38d6a +refs/heads/master: 49ba9b1bb3295fa690ae8f5091b093e61acf3ada diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index c6638c4b062c..edad6acb1d3c 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -2180,8 +2180,7 @@ static int receive_DataRequest(struct drbd_conf *mdev, enum drbd_packet cmd, drbd_send_ack_ex(mdev, P_OV_RESULT, sector, size, ID_IN_SYNC); break; default: - dev_err(DEV, "unexpected command (%s) in receive_DataRequest\n", - cmdname(cmd)); + BUG(); } if (verb && __ratelimit(&drbd_ratelimit_state)) dev_err(DEV, "Can not satisfy peer's read request, " @@ -2267,10 +2266,7 @@ static int receive_DataRequest(struct drbd_conf *mdev, enum drbd_packet cmd, break; default: - dev_err(DEV, "unexpected command (%s) in receive_DataRequest\n", - cmdname(cmd)); - fault_type = DRBD_FAULT_MAX; - goto out_free_e; + BUG(); } /* Throttle, drbd_rs_begin_io and submit should become asynchronous