Commit d448a2e1 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

drbd: Turn w_make_ov_request and make_resync_request into "normal" functions

These functions are not used as drbd_work callbacks.
Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 4d010392
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include "drbd_protocol.h" #include "drbd_protocol.h"
#include "drbd_req.h" #include "drbd_req.h"
static int w_make_ov_request(struct drbd_work *, int); static int make_ov_request(struct drbd_device *, int);
static int w_make_resync_request(struct drbd_work *, int); static int make_resync_request(struct drbd_device *, int);
/* endio handlers: /* endio handlers:
* drbd_md_io_complete (defined here) * drbd_md_io_complete (defined here)
...@@ -427,10 +427,10 @@ int w_resync_timer(struct drbd_work *w, int cancel) ...@@ -427,10 +427,10 @@ int w_resync_timer(struct drbd_work *w, int cancel)
switch (device->state.conn) { switch (device->state.conn) {
case C_VERIFY_S: case C_VERIFY_S:
w_make_ov_request(w, cancel); make_ov_request(device, cancel);
break; break;
case C_SYNC_TARGET: case C_SYNC_TARGET:
w_make_resync_request(w, cancel); make_resync_request(device, cancel);
break; break;
} }
...@@ -565,10 +565,8 @@ static int drbd_rs_number_requests(struct drbd_device *device) ...@@ -565,10 +565,8 @@ static int drbd_rs_number_requests(struct drbd_device *device)
return number; return number;
} }
static int w_make_resync_request(struct drbd_work *w, int cancel) static int make_resync_request(struct drbd_device *device, int cancel)
{ {
struct drbd_device_work *dw = device_work(w);
struct drbd_device *device = dw->device;
unsigned long bit; unsigned long bit;
sector_t sector; sector_t sector;
const sector_t capacity = drbd_get_capacity(device->this_bdev); const sector_t capacity = drbd_get_capacity(device->this_bdev);
...@@ -730,9 +728,8 @@ static int w_make_resync_request(struct drbd_work *w, int cancel) ...@@ -730,9 +728,8 @@ static int w_make_resync_request(struct drbd_work *w, int cancel)
return 0; return 0;
} }
static int w_make_ov_request(struct drbd_work *w, int cancel) static int make_ov_request(struct drbd_device *device, int cancel)
{ {
struct drbd_device *device = device_work(w)->device;
int number, i, size; int number, i, size;
sector_t sector; sector_t sector;
const sector_t capacity = drbd_get_capacity(device->this_bdev); const sector_t capacity = drbd_get_capacity(device->this_bdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment