drbd: Turn connection->volumes into connection->peer_devices

[mirror_ubuntu-zesty-kernel.git] / drivers / block / drbd / drbd_int.h

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index c88336c64b6b54bb73a3c5c3214be0df94741e12..41dced195653cb2347714200598c4575106b20f9 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -549,7 +549,7 @@ struct drbd_connection {
        struct list_head connections;
        struct drbd_resource *resource;
        struct kref kref;
-       struct idr volumes;             /* <connection, vnr> to device mapping */
+       struct idr peer_devices;        /* volume number to peer device mapping */
        enum drbd_conns cstate;         /* Only C_STANDALONE to C_WF_REPORT_PARAMS */
        unsigned susp:1;                /* IO suspended by user */
        unsigned susp_nod:1;            /* IO suspended because no data */
@@ -822,7 +822,10 @@ static inline unsigned int device_to_minor(struct drbd_device *device)
 
 static inline struct drbd_device *vnr_to_device(struct drbd_connection *connection, int vnr)
 {
-       return (struct drbd_device *)idr_find(&connection->volumes, vnr);
+       struct drbd_peer_device *peer_device;
+
+       peer_device = idr_find(&connection->peer_devices, vnr);
+       return peer_device ? peer_device->device : NULL;
 }
 
 /*