summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-03-04 15:51:01 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-03-11 16:32:14 +0100
commit1f55243024087b56aef0b1e6d9c0ea89c76f0a6b (patch)
treeeaecc8f10929ede52eefa9d51f7fd19d8a72fad1
parentd10a33c68b8526d95ef6ee72b371c392d48df4d3 (diff)
downloadop-kernel-dev-1f55243024087b56aef0b1e6d9c0ea89c76f0a6b.zip
op-kernel-dev-1f55243024087b56aef0b1e6d9c0ea89c76f0a6b.tar.gz
drbd: Renamed overwrite_peer to primary_force
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r--drivers/block/drbd/drbd_nl.c2
-rw-r--r--include/linux/drbd_nl.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 6492e32..6429d2b 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -407,7 +407,7 @@ static int drbd_nl_primary(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
}
reply->ret_code =
- drbd_set_role(mdev, R_PRIMARY, primary_args.overwrite_peer);
+ drbd_set_role(mdev, R_PRIMARY, primary_args.primary_force);
return 0;
}
diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
index b41050e..f7431a4 100644
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
@@ -12,7 +12,7 @@
#endif
NL_PACKET(primary, 1,
- NL_BIT( 1, T_MAY_IGNORE, overwrite_peer)
+ NL_BIT( 1, T_MAY_IGNORE, primary_force)
)
NL_PACKET(secondary, 2, )
OpenPOWER on IntegriCloud