aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-07-21 04:20:17 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-10-14 12:38:15 -0400
commit85719573dd716bc2ac3e098b44adfed884250bab (patch)
tree494e7797c923c7c584dc3c16d4d6ab2fcd6996a0 /drivers/block/drbd/drbd_receiver.c
parentd207450cf2731c6a2afa8c78fb31c7206cd35eba (diff)
drbd: Replaced some casts by an union. Improved comments
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 5f80b22e711d..0b03e3174f76 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -2097,7 +2097,7 @@ static int receive_DataRequest(struct drbd_conf *mdev, struct p_header *h)
2097 if (drbd_recv(mdev, di->digest, digest_size) != digest_size) 2097 if (drbd_recv(mdev, di->digest, digest_size) != digest_size)
2098 goto out_free_e; 2098 goto out_free_e;
2099 2099
2100 e->block_id = (u64)(unsigned long)di; 2100 e->digest = di;
2101 if (h->command == P_CSUM_RS_REQUEST) { 2101 if (h->command == P_CSUM_RS_REQUEST) {
2102 D_ASSERT(mdev->agreed_pro_version >= 89); 2102 D_ASSERT(mdev->agreed_pro_version >= 89);
2103 e->w.cb = w_e_end_csum_rs_req; 2103 e->w.cb = w_e_end_csum_rs_req;
@@ -3769,6 +3769,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
3769 drbd_thread_stop(&mdev->asender); 3769 drbd_thread_stop(&mdev->asender);
3770 drbd_free_sock(mdev); 3770 drbd_free_sock(mdev);
3771 3771
3772 /* wait for current activity to cease. */
3772 spin_lock_irq(&mdev->req_lock); 3773 spin_lock_irq(&mdev->req_lock);
3773 _drbd_wait_ee_list_empty(mdev, &mdev->active_ee); 3774 _drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
3774 _drbd_wait_ee_list_empty(mdev, &mdev->sync_ee); 3775 _drbd_wait_ee_list_empty(mdev, &mdev->sync_ee);