diff options
author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2010-10-14 09:01:21 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 13:15:38 -0400 |
commit | ca0e6098aad127a555ba29d12e0503dbb1577aac (patch) | |
tree | c16a9288d2bd49df42aab46ccac98426710d5a77 /drivers/block/drbd/drbd_main.c | |
parent | 856c50c7b616d50e1a3ccd4ce35f7814650fa594 (diff) |
drbd: relax the grace period of the md_sync timer again
Consolidate the ifdef's for the debug level, accidentally the used both
DEBUG and DRBD_DEBUG_MD_SYNC. Default to off.
For production, we can safely reduce the grace period for this timer
again the the value we used to have.
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_main.c')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 342574f6d92e..2e6a07e3848d 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -3565,7 +3565,7 @@ int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev) | |||
3565 | * the meta-data super block. This function sets MD_DIRTY, and starts a | 3565 | * the meta-data super block. This function sets MD_DIRTY, and starts a |
3566 | * timer that ensures that within five seconds you have to call drbd_md_sync(). | 3566 | * timer that ensures that within five seconds you have to call drbd_md_sync(). |
3567 | */ | 3567 | */ |
3568 | #ifdef DRBD_DEBUG_MD_SYNC | 3568 | #ifdef DEBUG |
3569 | void drbd_md_mark_dirty_(struct drbd_conf *mdev, unsigned int line, const char *func) | 3569 | void drbd_md_mark_dirty_(struct drbd_conf *mdev, unsigned int line, const char *func) |
3570 | { | 3570 | { |
3571 | if (!test_and_set_bit(MD_DIRTY, &mdev->flags)) { | 3571 | if (!test_and_set_bit(MD_DIRTY, &mdev->flags)) { |
@@ -3578,7 +3578,7 @@ void drbd_md_mark_dirty_(struct drbd_conf *mdev, unsigned int line, const char * | |||
3578 | void drbd_md_mark_dirty(struct drbd_conf *mdev) | 3578 | void drbd_md_mark_dirty(struct drbd_conf *mdev) |
3579 | { | 3579 | { |
3580 | if (!test_and_set_bit(MD_DIRTY, &mdev->flags)) | 3580 | if (!test_and_set_bit(MD_DIRTY, &mdev->flags)) |
3581 | mod_timer(&mdev->md_sync_timer, jiffies + HZ); | 3581 | mod_timer(&mdev->md_sync_timer, jiffies + 5*HZ); |
3582 | } | 3582 | } |
3583 | #endif | 3583 | #endif |
3584 | 3584 | ||