path: root/drivers/block/drbd/drbd_int.h
diff options
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-05-03 13:14:15 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:55:41 +0100
commita0095508cac5c413c7119076b26f536486314ef1 (patch)
tree8300fc680887021c6c2e16b4236f899161759056 /drivers/block/drbd/drbd_int.h
parent934e6138b56203231d757d7b5ca3252edffc210e (diff)
drbd: Renamed the net_conf_update mutex to conf_update
Preparing to use the same mutex for disk_conf updates 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_int.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 8655fcb8202..0311dfde776 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -832,7 +832,7 @@ struct drbd_tconn { /* is a resource from the config file */
unsigned long flags;
struct net_conf *net_conf; /* content protected by rcu */
- struct mutex net_conf_update; /* mutex for ready-copy-update of net_conf */
+ struct mutex conf_update; /* mutex for ready-copy-update of net_conf and disk_conf */
wait_queue_head_t ping_wait; /* Woken upon reception of a ping, and a state change */
struct res_opts res_opts;