system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-23 03:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

drbd: Rename w_prev_work_done -> w_complete

Browse source 
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>
This commit is contained in:
Andreas Gruenbacher 2011-07-25 13:51:18 +02:00 committed by Philipp Reisner
parent d9f65229f6
commit 8682eae9b4
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/block/drbd/drbd_int.h
View file

@ -1326,7 +1326,6 @@ extern int w_send_write_hint(struct drbd_work *, int);
extern int w_make_resync_request(struct drbd_work *, int);
extern int w_send_dblock(struct drbd_work *, int);
extern int w_send_read_req(struct drbd_work *, int);
extern int w_prev_work_done(struct drbd_work *, int);
extern int w_e_reissue(struct drbd_work *, int);
extern int w_restart_disk_io(struct drbd_work *, int);
extern int w_send_out_of_sync(struct drbd_work *, int);

10
drivers/block/drbd/drbd_receiver.c
View file

@ -4482,11 +4482,19 @@ static void drbdd(struct drbd_connection *connection)
conn_request_state(connection, NS(conn, C_PROTOCOL_ERROR), CS_HARD);
}
static int w_complete(struct drbd_work *w, int cancel)
{
struct drbd_wq_barrier *b = container_of(w, struct drbd_wq_barrier, w);
complete(&b->done);
return 0;
}
void conn_flush_workqueue(struct drbd_connection *connection)
{
struct drbd_wq_barrier barr;
barr.w.cb = w_prev_work_done;
barr.w.cb = w_complete;
barr.w.connection = connection;
init_completion(&barr.done);
drbd_queue_work(&connection->sender_work, &barr.w);

8
drivers/block/drbd/drbd_worker.c
View file

@ -1262,14 +1262,6 @@ int w_e_end_ov_reply(struct drbd_work *w, int cancel)
return err;
}
int w_prev_work_done(struct drbd_work *w, int cancel)
{
struct drbd_wq_barrier *b = container_of(w, struct drbd_wq_barrier, w);
complete(&b->done);
return 0;
}
/* FIXME
* We need to track the number of pending barrier acks,
* and to be able to wait for them.