diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2010-10-14 15:01:21 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 19:15:38 +0200 |
| commit | ca0e6098aad127a555ba29d12e0503dbb1577aac (patch) | |
| tree | c16a9288d2bd49df42aab46ccac98426710d5a77 | |
| parent | 856c50c7b616d50e1a3ccd4ce35f7814650fa594 (diff) | |
| download | linux-ca0e6098aad127a555ba29d12e0503dbb1577aac.tar.gz linux-ca0e6098aad127a555ba29d12e0503dbb1577aac.tar.bz2 linux-ca0e6098aad127a555ba29d12e0503dbb1577aac.zip | |
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>
| -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) * the meta-data super block. This function sets MD_DIRTY, and starts a * timer that ensures that within five seconds you have to call drbd_md_sync(). */ -#ifdef DRBD_DEBUG_MD_SYNC +#ifdef DEBUG void drbd_md_mark_dirty_(struct drbd_conf *mdev, unsigned int line, const char *func) { 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 * void drbd_md_mark_dirty(struct drbd_conf *mdev) { if (!test_and_set_bit(MD_DIRTY, &mdev->flags)) - mod_timer(&mdev->md_sync_timer, jiffies + HZ); + mod_timer(&mdev->md_sync_timer, jiffies + 5*HZ); } #endif |