Merge tag 'fixes-for-v3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[firefly-linux-kernel-4.4.55.git] / include / linux / drbd_genl.h

diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index 826008f297fe6e670133b0ec906a22d72b3ad15e..d0d8fac8a6e4ffa77141b038f898537f31ed28f0 100644 (file)
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -130,6 +130,8 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
        __flg_field_def(19, DRBD_GENLA_F_MANDATORY,     md_flushes, DRBD_MD_FLUSHES_DEF)
        __u32_field_def(20,     DRBD_GENLA_F_MANDATORY, disk_timeout, DRBD_DISK_TIMEOUT_DEF)
        __u32_field_def(21,     0 /* OPTIONAL */,       read_balancing, DRBD_READ_BALANCING_DEF)
+       /* 9: __u32_field_def(22,       DRBD_GENLA_F_MANDATORY, unplug_watermark, DRBD_UNPLUG_WATERMARK_DEF) */
+       __flg_field_def(23,     0 /* OPTIONAL */,       al_updates, DRBD_AL_UPDATES_DEF)
 )
 
 GENL_struct(DRBD_NLA_RESOURCE_OPTS, 4, res_opts,
@@ -168,6 +170,7 @@ GENL_struct(DRBD_NLA_NET_CONF, 5, net_conf,
        __flg_field_def(27, DRBD_GENLA_F_MANDATORY,     always_asbp, DRBD_ALWAYS_ASBP_DEF)
        __flg_field(28, DRBD_GENLA_F_MANDATORY | DRBD_F_INVARIANT,      tentative)
        __flg_field_def(29,     DRBD_GENLA_F_MANDATORY, use_rle, DRBD_USE_RLE_DEF)
+       /* 9: __u32_field_def(30,       DRBD_GENLA_F_MANDATORY, fencing_policy, DRBD_FENCING_DEF) */
 )
 
 GENL_struct(DRBD_NLA_SET_ROLE_PARMS, 6, set_role_parms,
@@ -208,10 +211,21 @@ GENL_struct(DRBD_NLA_STATE_INFO, 8, state_info,
        /* for pre and post notifications of helper execution */
        __str_field(13, DRBD_GENLA_F_MANDATORY, helper, 32)
        __u32_field(14, DRBD_GENLA_F_MANDATORY, helper_exit_code)
+
+       __u64_field(15,                      0, send_cnt)
+       __u64_field(16,                      0, recv_cnt)
+       __u64_field(17,                      0, read_cnt)
+       __u64_field(18,                      0, writ_cnt)
+       __u64_field(19,                      0, al_writ_cnt)
+       __u64_field(20,                      0, bm_writ_cnt)
+       __u32_field(21,                      0, ap_bio_cnt)
+       __u32_field(22,                      0, ap_pending_cnt)
+       __u32_field(23,                      0, rs_pending_cnt)
 )
 
 GENL_struct(DRBD_NLA_START_OV_PARMS, 9, start_ov_parms,
        __u64_field(1, DRBD_GENLA_F_MANDATORY,  ov_start_sector)
+       __u64_field(2, DRBD_GENLA_F_MANDATORY,  ov_stop_sector)
 )
 
 GENL_struct(DRBD_NLA_NEW_C_UUID_PARMS, 10, new_c_uuid_parms,