diff options
| author | Andreas Gruenbacher | 2011-03-16 17:16:12 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:44 +0100 |
| commit | e2b3032b902f600980dab9516d12e955c68aa1f4 (patch) | |
| tree | 4adc4923c757af6331ab2a063985f9d097febc4b /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Make all worker callbacks return 0 upon success and an error code other... (diff) | |
| download | kernel-qcow2-linux-e2b3032b902f600980dab9516d12e955c68aa1f4.tar.gz kernel-qcow2-linux-e2b3032b902f600980dab9516d12e955c68aa1f4.tar.xz kernel-qcow2-linux-e2b3032b902f600980dab9516d12e955c68aa1f4.zip | |
drbd: drbd_process_done_ee(): Return 0 upon success and an error code otherwise
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_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index d3e3188575e6..03c21e594630 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -409,7 +409,7 @@ static int drbd_process_done_ee(struct drbd_conf *mdev) LIST_HEAD(work_list); LIST_HEAD(reclaimed); struct drbd_peer_request *peer_req, *t; - int ok = 1; + int err = 0; spin_lock_irq(&mdev->tconn->req_lock); reclaim_net_ee(mdev, &reclaimed); @@ -424,13 +424,17 @@ static int drbd_process_done_ee(struct drbd_conf *mdev) * all ignore the last argument. */ list_for_each_entry_safe(peer_req, t, &work_list, w.list) { + int err2; + /* list_del not necessary, next/prev members not touched */ - ok = !peer_req->w.cb(&peer_req->w, !ok) && ok; + err2 = peer_req->w.cb(&peer_req->w, !!err); + if (!err) + err = err2; drbd_free_ee(mdev, peer_req); } wake_up(&mdev->ee_wait); - return ok; + return err; } void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head) @@ -4711,7 +4715,7 @@ static int tconn_process_done_ee(struct drbd_tconn *tconn) clear_bit(SIGNAL_ASENDER, &tconn->flags); flush_signals(current); idr_for_each_entry(&tconn->volumes, mdev, i) { - if (!drbd_process_done_ee(mdev)) + if (drbd_process_done_ee(mdev)) return 1; /* error */ } set_bit(SIGNAL_ASENDER, &tconn->flags); |