diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-04-01 03:57:40 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-05-17 19:09:13 -0400 |
commit | c3fe30b0e7cd67e0207097f5f39ce9626644879e (patch) | |
tree | d2c8fbc9b6dec42f0dc0e902eade9b22e921bb17 | |
parent | 8d4ce82b3ccd755c8ba401469ced5286b1e02284 (diff) |
drbd: cleanup: This code path to trigger a resync is no longer needed
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index c7285e16b667..c3504ddd59c1 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -2853,7 +2853,6 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) | |||
2853 | unsigned int max_seg_s; | 2853 | unsigned int max_seg_s; |
2854 | sector_t p_size, p_usize, my_usize; | 2854 | sector_t p_size, p_usize, my_usize; |
2855 | int ldsc = 0; /* local disk size changed */ | 2855 | int ldsc = 0; /* local disk size changed */ |
2856 | enum drbd_conns nconn; | ||
2857 | 2856 | ||
2858 | ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE; | 2857 | ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE; |
2859 | if (drbd_recv(mdev, h->payload, h->length) != h->length) | 2858 | if (drbd_recv(mdev, h->payload, h->length) != h->length) |
@@ -2920,22 +2919,6 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) | |||
2920 | drbd_set_my_capacity(mdev, p_size); | 2919 | drbd_set_my_capacity(mdev, p_size); |
2921 | } | 2920 | } |
2922 | 2921 | ||
2923 | if (mdev->p_uuid && mdev->state.conn <= C_CONNECTED && get_ldev(mdev)) { | ||
2924 | nconn = drbd_sync_handshake(mdev, | ||
2925 | mdev->state.peer, mdev->state.pdsk); | ||
2926 | put_ldev(mdev); | ||
2927 | |||
2928 | if (nconn == C_MASK) { | ||
2929 | drbd_force_state(mdev, NS(conn, C_DISCONNECTING)); | ||
2930 | return FALSE; | ||
2931 | } | ||
2932 | |||
2933 | if (drbd_request_state(mdev, NS(conn, nconn)) < SS_SUCCESS) { | ||
2934 | drbd_force_state(mdev, NS(conn, C_DISCONNECTING)); | ||
2935 | return FALSE; | ||
2936 | } | ||
2937 | } | ||
2938 | |||
2939 | if (get_ldev(mdev)) { | 2922 | if (get_ldev(mdev)) { |
2940 | if (mdev->ldev->known_size != drbd_get_capacity(mdev->ldev->backing_bdev)) { | 2923 | if (mdev->ldev->known_size != drbd_get_capacity(mdev->ldev->backing_bdev)) { |
2941 | mdev->ldev->known_size = drbd_get_capacity(mdev->ldev->backing_bdev); | 2924 | mdev->ldev->known_size = drbd_get_capacity(mdev->ldev->backing_bdev); |