Skip to content

Commit

Permalink
drbd: Turn no-md-flushes into md-flushes={yes|no}
Browse files Browse the repository at this point in the history
Change the --no-md-flushes drbdsetup command line option as well as
the no_md_flush netlink packet.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Andreas Gruenbacher authored and Philipp Reisner committed Nov 8, 2012
1 parent d0c980e commit e544046
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/block/drbd/drbd_nl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1449,10 +1449,10 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)

/* Reset the "barriers don't work" bits here, then force meta data to
* be written, to ensure we determine if barriers are supported. */
if (new_disk_conf->no_md_flush)
set_bit(MD_NO_FUA, &mdev->flags);
else
if (new_disk_conf->md_flushes)
clear_bit(MD_NO_FUA, &mdev->flags);
else
set_bit(MD_NO_FUA, &mdev->flags);

/* Point of no return reached.
* Devices and memory are no longer released by error cleanup below.
Expand Down
2 changes: 1 addition & 1 deletion include/linux/drbd_genl.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
__flg_field_def(16, GENLA_F_MANDATORY, disk_barrier, 1)
__flg_field_def(17, GENLA_F_MANDATORY, disk_flushes, 1)
__flg_field_def(18, GENLA_F_MANDATORY, disk_drain, 1)
__flg_field_def(19, GENLA_F_MANDATORY, no_md_flush, 0)
__flg_field_def(19, GENLA_F_MANDATORY, md_flushes, 1)
)

GENL_struct(DRBD_NLA_RESOURCE_OPTS, 4, res_opts,
Expand Down

0 comments on commit e544046

Please sign in to comment.