3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 933d4767c110..72b1dfa4b656 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -926,7 +926,7 @@ int __drbd_send_protocol(struct drbd_tconn *tconn, enum drbd_packet cmd)
         rcu_read_lock();
         nc = rcu_dereference(tconn->net_conf);
 
-        if (nc->dry_run && tconn->agreed_pro_version < 92) {
+        if (nc->tentative && tconn->agreed_pro_version < 92) {
                 rcu_read_unlock();
                 mutex_unlock(&sock->mutex);
                 conn_err(tconn, "--dry-run is not supported by peer");
@@ -945,7 +945,7 @@ int __drbd_send_protocol(struct drbd_tconn *tconn, enum drbd_packet cmd)
         cf = 0;
         if (nc->discard_my_data)
                 cf |= CF_DISCARD_MY_DATA;
-        if (nc->dry_run)
+        if (nc->tentative)
                 cf |= CF_DRY_RUN;
         p->conn_flags    = cpu_to_be32(cf);
 
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index ab1d36cb6214..d55a3cb21c31 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -2836,7 +2836,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_conf *mdev, enum drbd_rol
         enum drbd_conns rv = C_MASK;
         enum drbd_disk_state mydisk;
         struct net_conf *nc;
-        int hg, rule_nr, rr_conflict, dry_run;
+        int hg, rule_nr, rr_conflict, tentative;
 
         mydisk = mdev->state.disk;
         if (mydisk == D_NEGOTIATING)
@@ -2916,7 +2916,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_conf *mdev, enum drbd_rol
                              (hg < 0) ? "peer" : "this");
         }
         rr_conflict = nc->rr_conflict;
-        dry_run = nc->dry_run;
+        tentative = nc->tentative;
         rcu_read_unlock();
 
         if (hg == -100) {
@@ -2949,7 +2949,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_conf *mdev, enum drbd_rol
                 }
         }
 
-        if (dry_run || test_bit(CONN_DRY_RUN, &mdev->tconn->flags)) {
+        if (tentative || test_bit(CONN_DRY_RUN, &mdev->tconn->flags)) {
                 if (hg == 0)
                         dev_info(DEV, "dry-run connect: No resync, would become Connected immediately.\n");
                 else
diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index b93db6c83882..e879a9324380 100644
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -164,7 +164,7 @@ GENL_struct(DRBD_NLA_NET_CONF, 5, net_conf,
         __flg_field(25, DRBD_GENLA_F_MANDATORY | DRBD_F_INVARIANT,      discard_my_data)
         __flg_field_def(26, DRBD_GENLA_F_MANDATORY,     tcp_cork, DRBD_TCP_CORK_DEF)
         __flg_field_def(27, DRBD_GENLA_F_MANDATORY,     always_asbp, DRBD_ALWAYS_ASBP_DEF)
-        __flg_field(28, DRBD_GENLA_F_MANDATORY | DRBD_F_INVARIANT,      dry_run)
+        __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)
 )