hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Philipp Reisner 2012-03-30 14:12:15 +02:00
parent 9ed57dcbda
commit 27eb13e99b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/drbd/drbd_nl.c
View File

@ -1229,6 +1229,9 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
} }
mutex_unlock(&mdev->tconn->conf_update); mutex_unlock(&mdev->tconn->conf_update);
drbd_bump_write_ordering(mdev->tconn, WO_bdev_flush);
drbd_md_sync(mdev); drbd_md_sync(mdev);
if (mdev->state.conn >= C_CONNECTED) if (mdev->state.conn >= C_CONNECTED)

2
drivers/block/drbd/drbd_receiver.c
View File

@ -1229,7 +1229,7 @@ void drbd_bump_write_ordering(struct drbd_tconn *tconn, enum write_ordering_e wo
wo = min(pwo, wo); wo = min(pwo, wo);
rcu_read_lock(); rcu_read_lock();
idr_for_each_entry(&tconn->volumes, mdev, vnr) { idr_for_each_entry(&tconn->volumes, mdev, vnr) {
if (!get_ldev(mdev)) if (!get_ldev_if_state(mdev, D_ATTACHING))
continue; continue;
dc = rcu_dereference(mdev->ldev->disk_conf); dc = rcu_dereference(mdev->ldev->disk_conf);