Commits · a8cd15ba7919eaf1f416857f983a502cc261af26 · nexedi / linux

17 Feb, 2014 40 commits

drbd: struct drbd_peer_request: Use drbd_work instead of drbd_device_work · a8cd15ba
Andreas Gruenbacher authored Aug 25, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
a8cd15ba
drbd: struct after_conn_state_chg_work: Use drbd_work instead of drbd_device_work · 4c007603
Andreas Gruenbacher authored Aug 25, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
4c007603

drbd: Turn conn_flush_workqueue() into drbd_flush_workqueue() · b5043c5e

Andreas Gruenbacher authored Jul 28, 2011

The new function can flush any work queue, not just the work queue of the data
socket of a connection.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

b5043c5e

drbd: Create a dedicated struct drbd_device_work · 84b8c06b

Andreas Gruenbacher authored Jul 28, 2011

drbd_device_work is a work item that has a reference to a device,
while drbd_work is a more generic work item that does not carry
a reference to a device.

All callbacks get a pointer to a drbd_work instance, those callbacks
that expect a drbd_device_work use the container_of macro to get it.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

84b8c06b

drbd: Rename w_prev_work_done -> w_complete · 8682eae9

Andreas Gruenbacher authored Jul 25, 2011

Also move it to drbd_receiver.c and make it static.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

8682eae9

drbd: Move string function prototypes from linux/drbd.h to drbd_string.h · d9f65229
Andreas Gruenbacher authored Sep 01, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
d9f65229

drbd: Remove useless assertion · 137975c1

Andreas Gruenbacher authored Aug 24, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

137975c1

drbd: Kill drbd_task_to_thread_name() · c60b0251

Andreas Gruenbacher authored Aug 10, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

c60b0251

drbd: Pass a peer device to a number of fuctions · 69a22773

Andreas Gruenbacher authored Aug 09, 2011

These functions actually operate on a peer device, or
need a peer device.

drbd_prepare_command(), drbd_send_command(), drbd_send_sync_param()
drbd_send_uuids(), drbd_gen_and_send_sync_uuid(), drbd_send_sizes()
drbd_send_state(), drbd_send_current_state(), and drbd_send_state_req()
drbd_send_sr_reply(), drbd_send_ack(), drbd_send_drequest(),
drbd_send_drequest_csum(), drbd_send_ov_request(), drbd_send_dblock()
drbd_send_block(), drbd_send_out_of_sync(), recv_dless_read()
drbd_drain_block(), receive_bitmap_plain(), recv_resync_read()
read_in_block(), read_for_csum(), drbd_alloc_pages(), drbd_alloc_peer_req()
need_peer_seq(), update_peer_seq(), wait_for_and_update_peer_seq()
drbd_sync_handshake(), drbd_asb_recover_{0,1,2}p(), drbd_connected()
drbd_disconnected(), decode_bitmap_c() and recv_bm_rle_bits()
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

69a22773

drbd: Replace vnr_to_mdev() with conn_peer_device() · 9f4fe9ad

Andreas Gruenbacher authored Aug 09, 2011

The new function returns a peer device, which allows us to eliminate a few
instances of first_peer_device().
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

9f4fe9ad

drbd: drbd_csum_bio(), drbd_csum_ee(): Remove unused device argument · 79a3c8d3
Andreas Gruenbacher authored Aug 09, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
79a3c8d3

drbd: Function prototype cleanups · 753c6191

Andreas Gruenbacher authored Jul 22, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

753c6191

drbd: Rename drbdd_init() -> drbd_receiver() · 8fe60551

Andreas Gruenbacher authored Jul 22, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

8fe60551

drbd: Move cpu_mask from connection to resource · 625a6ba2

Andreas Gruenbacher authored Jul 22, 2011

Also fix drbd_calc_cpu_mask() to spread resources equally over all online cpus
independent of device minor numbers.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

625a6ba2

drbd: Define the size of res_opts->cpu_mask in a single place · f44d0436

Andreas Gruenbacher authored Jul 22, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

f44d0436

drbd: Move susp, susp_nod, susp_fen from connection to resource · 6bbf53ca
Andreas Gruenbacher authored Jul 08, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
6bbf53ca

drbd: Move conf_mutex from connection to resource · 0500813f

Andreas Gruenbacher authored Jul 07, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

0500813f

drbd: drbd_adm_prepare(): Only set adm_ctx.connection when a connection is requested · 3ab706fe

Andreas Gruenbacher authored Jul 06, 2011

Also change drbd_adm_connect() to expect a resource after it requested one.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

3ab706fe

drbd: Iterate over all connections · b6f85ef9

Andreas Gruenbacher authored Jul 06, 2011

in drbd_adm_down(), drbd_create_device() and drbd_set_role()
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

b6f85ef9

drbd: Rename net_conf variables old_conf -> old_net_conf and new_conf -> new_net_conf · 270eb5c9
Andreas Gruenbacher authored Jul 06, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
270eb5c9
drbd: drbd_create_device(): Take a resource instead of a connection argument · 59515a2e
Andreas Gruenbacher authored Jul 06, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
59515a2e
drbd: drbd_adm_new_resource(): Check if resource exists, not if it has any connections · 5c661042
Andreas Gruenbacher authored Jul 05, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
5c661042
drbd: get_one_status(): Iterate over resource->devices instead of connection->peer_devices · 251b8f8e
Andreas Gruenbacher authored Jul 05, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
251b8f8e
drbd: Rename drbd_{create,delete}_minor -> drbd_{create,delete}_device · f82795d6
Andreas Gruenbacher authored Jul 03, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
f82795d6

drbd: Add explicit device parameter to D_ASSERT · 0b0ba1ef

Andreas Gruenbacher authored Jun 27, 2011

The implicit dependency on a variable inside the macro is problematic.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

0b0ba1ef

drbd: Replace and remove the obsolete conn_() macros · 1ec861eb

Andreas Gruenbacher authored Jul 06, 2011

With the polymorphic drbd_() macros, we no longer need the connection
specific variants.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

1ec861eb

drbd: Turn drbd_printk() into a polymorphic macro · 3b52beff

Andreas Gruenbacher authored Jul 06, 2011

This allows drbd_alert(), drbd_err(), drbd_warn(), and drbd_info() to work for
a resource, device, or connection so that we don't have to introduce three
separate sets of macros for that.

The drbd_printk() macro itself is pretty ugly, but that problem is limited to
one place in the code. Using drbd_printk() on an object type which it doesn't
understand results in an undefined drbd_printk_with_wrong_object_type symbol.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

3b52beff

drbd: Remove the terrible DEV hack · d0180171

Andreas Gruenbacher authored Jul 03, 2011

DRBD was using dev_err() and similar all over the code; instead of having to
write dev_err(disk_to_dev(device->vdisk), ...) to convert a drbd_device into a
kernel device, a DEV macro was used which implicitly references the device
variable. This is terrible; introduce separate drbd_err() and similar macros
with an explicit device parameter instead.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

d0180171

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

Andreas Gruenbacher authored Jun 21, 2011

Let connection->peer_devices point to peer devices; connection->volumes was
pointing to devices.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

c06ece6b

drbd: Move resource options from connection to resource · eb6bea67

Andreas Gruenbacher authored Jun 21, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

eb6bea67

drbd: conn_try_disconnect(): Use parameter instead of the global variable · 9693da23
Andreas Gruenbacher authored Jun 21, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
9693da23

drbd: Replace conn_get_by_name() with drbd_find_resource() · 4bc76048

Andreas Gruenbacher authored Jun 13, 2011

So far, connections and resources always come in pairs, but in the future with
multiple connections per resource, the names will stick with the resources.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

4bc76048

drbd: Add struct drbd_resource->devices · 803ea134

Andreas Gruenbacher authored Jun 09, 2011

This allows to access the volumes of a resource by number.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

803ea134

drbd: Minor cleanup in conn_new_minor() · 93e4bf7a

Andreas Gruenbacher authored May 23, 2013

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

93e4bf7a

drbd: Add struct drbd_device->resource · d8628a86

Andreas Gruenbacher authored Jun 09, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

d8628a86

drbd: drbd_adm_down(): Move valid resource name check to drbd_adm_prepare() · a10f6b8a
Andreas Gruenbacher authored Jun 09, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
a10f6b8a

drbd: Add struct drbd_resource · 77c556f6

Andreas Gruenbacher authored Jun 08, 2011

In a first step, each resource has exactly one connection, and both objects are
allocated at the same time.  The final result will be one resource and zero or
more connections.

Only allow to delete a resource if all its connections are C_STANDALONE.
Stop the worker threads of all connections early enough.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

77c556f6

drbd: Improve some function and variable naming · 05a10ec7

Andreas Gruenbacher authored Jun 07, 2011

Rename functions
conn_destroy() -> drbd_destroy_connection(),
drbd_minor_destroy() -> drbd_destroy_device()
drbd_adm_add_minor() -> drbd_adm_add_minor()
drbd_adm_delete_minor() -> drbd_adm_del_minor()

Rename global variable minors to drbd_devices
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

05a10ec7

drbd: Introduce "peer_device" object between "device" and "connection" · a6b32bc3

Andreas Gruenbacher authored May 31, 2011

In a setup where a device (aka volume) can replicate to multiple peers and one
connection can be shared between multiple devices, we need separate objects to
represent devices on peer nodes and network connections.

As a first step to introduce multiple connections per device, give each
drbd_device object a single drbd_peer_device object which connects it to a
drbd_connection object.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

a6b32bc3

drbd: Rename drbd_tconn -> drbd_connection · bde89a9e

Andreas Gruenbacher authored May 30, 2011

sed -i -e 's:all_tconn:connections:g' -e 's:tconn:connection:g'
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

bde89a9e