diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2012-03-30 08:12:15 -0400 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:58:25 -0500 |
| commit | 27eb13e99b515c52ba5a151a1acce6afb8a9b2b6 (patch) | |
| tree | 5b9046d339f29dc22a5f57cfd5650d5db33d9e7f | |
| parent | 9ed57dcbda37a1a1fb25ccda4206cc417e54e813 (diff) | |
drbd: Fixed processing of disk-barrier, disk-flushes and disk-drain
Since drbd_bump_write_ordering() is called in the attaching
process while the disk state is D_ATTACHING, it was not
considering these three flags during attach.
A call to this function was missing form drbd_adm_disk_opts().
Fixed both issues.
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_nl.c | 3 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index c5aa08474a35..ce9f4ca55ce2 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
| @@ -1229,6 +1229,9 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) | |||
| 1229 | } | 1229 | } |
| 1230 | 1230 | ||
| 1231 | mutex_unlock(&mdev->tconn->conf_update); | 1231 | mutex_unlock(&mdev->tconn->conf_update); |
| 1232 | |||
| 1233 | drbd_bump_write_ordering(mdev->tconn, WO_bdev_flush); | ||
| 1234 | |||
| 1232 | drbd_md_sync(mdev); | 1235 | drbd_md_sync(mdev); |
| 1233 | 1236 | ||
| 1234 | if (mdev->state.conn >= C_CONNECTED) | 1237 | if (mdev->state.conn >= C_CONNECTED) |
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 786a75510798..e8cd4c4acc65 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
| @@ -1229,7 +1229,7 @@ void drbd_bump_write_ordering(struct drbd_tconn *tconn, enum write_ordering_e wo | |||
| 1229 | wo = min(pwo, wo); | 1229 | wo = min(pwo, wo); |
| 1230 | rcu_read_lock(); | 1230 | rcu_read_lock(); |
| 1231 | idr_for_each_entry(&tconn->volumes, mdev, vnr) { | 1231 | idr_for_each_entry(&tconn->volumes, mdev, vnr) { |
| 1232 | if (!get_ldev(mdev)) | 1232 | if (!get_ldev_if_state(mdev, D_ATTACHING)) |
| 1233 | continue; | 1233 | continue; |
| 1234 | dc = rcu_dereference(mdev->ldev->disk_conf); | 1234 | dc = rcu_dereference(mdev->ldev->disk_conf); |
| 1235 | 1235 | ||