diff options
| author | Lars Ellenberg | 2011-04-27 21:09:55 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:50:38 +0100 |
| commit | 5979e36155f7875f0544f3c696f8ce863417cc68 (patch) | |
| tree | cb9433d8980b19659bc26517a71fdfeb91d624dc /drivers/block/drbd/drbd_main.c | |
| parent | drbd: Consider all crypto options in connect and in net-options (diff) | |
| download | kernel-qcow2-linux-5979e36155f7875f0544f3c696f8ce863417cc68.tar.gz kernel-qcow2-linux-5979e36155f7875f0544f3c696f8ce863417cc68.tar.xz kernel-qcow2-linux-5979e36155f7875f0544f3c696f8ce863417cc68.zip | |
drbd: on reconfiguration requests, mind the SET_DEFAULTS flag
The DRBD_GENL_F_SET_DEFAULTS flag was ignored
for drbd_adm_disk_opts() and drbd_adm_net_opts().
Factor out drbd_set_*_defaults() helper functions,
and call them appropriately.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f0a0e1759bab..7e56f88c0b68 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2460,10 +2460,7 @@ struct drbd_tconn *conn_create(const char *name) drbd_thread_init(tconn, &tconn->worker, drbd_worker, "worker"); drbd_thread_init(tconn, &tconn->asender, drbd_asender, "asender"); - tconn->res_opts = (struct res_opts) { - {}, 0, /* cpu_mask */ - DRBD_ON_NO_DATA_DEF, /* on_no_data */ - }; + drbd_set_res_opts_default(&tconn->res_opts); down_write(&drbd_cfg_rwsem); kref_init(&tconn->kref); |