diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2011-05-16 15:31:45 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-05-24 10:06:44 +0200 |
| commit | 76727f684aa2d6a2dc59a7e5cf77e092a1bf4fb6 (patch) | |
| tree | 59e80cf30c5cbf33f5179889025b8b0d7afdd970 /drivers/block | |
| parent | d2e17807e3799bae24664a92f4d2d3dade021e00 (diff) | |
| download | op-kernel-dev-76727f684aa2d6a2dc59a7e5cf77e092a1bf4fb6.zip op-kernel-dev-76727f684aa2d6a2dc59a7e5cf77e092a1bf4fb6.tar.gz | |
drbd: fix potential activity log refcount imbalance in error path
It is no longer sufficient to trigger on local WRITE,
we need to check on (rq_state & RQ_IN_ACT_LOG)
before calling drbd_al_complete_io also in the error path.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 5c0c8be..14645bd 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -1033,7 +1033,7 @@ fail_conflicting: err = 0; fail_free_complete: - if (rw == WRITE && local) + if (req->rq_state & RQ_IN_ACT_LOG) drbd_al_complete_io(mdev, sector); fail_and_free_req: if (local) { |
