OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d67a13b
)
drbd: Disable delay probes for the upcomming release
author
Philipp Reisner
<philipp.reisner@linbit.com>
Mon, 19 Jul 2010 13:04:57 +0000
(15:04 +0200)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 13 Aug 2010 20:30:52 +0000
(13:30 -0700)
commit
6710a5760355be8f2e51682f41b0d3fc76550309
upstream.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/block/drbd/drbd_main.c
patch
|
blob
|
history
diff --git
a/drivers/block/drbd/drbd_main.c
b/drivers/block/drbd/drbd_main.c
index
16ef66a
..
60bbfcf
100644
(file)
--- a/
drivers/block/drbd/drbd_main.c
+++ b/
drivers/block/drbd/drbd_main.c
@@
-2371,11
+2371,7
@@
static int _drbd_send_zc_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e)
static void consider_delay_probes(struct drbd_conf *mdev)
{
- if (mdev->state.conn != C_SYNC_SOURCE || mdev->agreed_pro_version < 93)
- return;
-
- if (mdev->dp_volume_last + mdev->sync_conf.dp_volume * 2 < mdev->send_cnt)
- drbd_send_delay_probes(mdev);
+ return;
}
static int w_delay_probes(struct drbd_conf *mdev, struct drbd_work *w, int cancel)