diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2014-01-27 16:04:14 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-07-10 18:34:51 +0200 |
| commit | fcb096740a13c839e16e6735ba486879b54bc861 (patch) | |
| tree | 355c0a19f2d8faa2f666507f1f18448499273fa5 /drivers/block | |
| parent | 5ab7d2c005135849cf0bb1485d954c98f2cca57c (diff) | |
| download | linux-0-day-fcb096740a13c839e16e6735ba486879b54bc861.tar.gz linux-0-day-fcb096740a13c839e16e6735ba486879b54bc861.tar.xz | |
drbd: stop the meta data sync timer before open coded meta data sync
If we re-write all meta data due to resize, we have open-coded write-out
of our meta data super block. Stop the md_sync_timer, it would just
trigger scary but in this case spurious "timer expired" messages.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 52221f67e3956..133e9b37c6c27 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -967,6 +967,10 @@ drbd_determine_dev_size(struct drbd_device *device, enum dds_flags flags, struct if (la_size_changed || md_moved || rs) { u32 prev_flags; + /* We do some synchronous IO below, which may take some time. + * Clear the timer, to avoid scary "timer expired!" messages, + * "Superblock" is written out at least twice below, anyways. */ + del_timer(&device->md_sync_timer); drbd_al_shrink(device); /* All extents inactive. */ prev_flags = md->flags; |