diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2013-02-28 10:30:19 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-11-25 17:22:03 +0100 |
| commit | 7dbb4386b90a13a7b0cab12aae184e5e04c536c3 (patch) | |
| tree | 6a2d4915247505c314e8b3cceb2e1eeb45980cba /drivers/block/drbd/drbd_int.h | |
| parent | drbd: fix "endless" transfer log walk in protocol A (diff) | |
| download | linux-7dbb4386b90a13a7b0cab12aae184e5e04c536c3.tar.xz linux-7dbb4386b90a13a7b0cab12aae184e5e04c536c3.zip | |
drbd: make suspend_io() / resume_io() must be thread and recursion safe
Avoid to prematurely resume application IO: don't set/clear a single
bit, but inc/dec an atomic counter.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index a26265375e1e..df3d89d5777a 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -500,7 +500,6 @@ enum { MD_NO_FUA, /* Users wants us to not use FUA/FLUSH on meta data dev */ - SUSPEND_IO, /* suspend application io */ BITMAP_IO, /* suspend application io; once no more io in flight, start bitmap io */ BITMAP_IO_QUEUED, /* Started bitmap IO */ @@ -880,6 +879,7 @@ struct drbd_device { atomic_t rs_pending_cnt; /* RS request/data packets on the wire */ atomic_t unacked_cnt; /* Need to send replies for */ atomic_t local_cnt; /* Waiting for local completion */ + atomic_t suspend_cnt; /* Interval tree of pending local requests */ struct rb_root read_requests; @@ -2263,7 +2263,7 @@ static inline bool may_inc_ap_bio(struct drbd_device *device) if (drbd_suspended(device)) return false; - if (test_bit(SUSPEND_IO, &device->flags)) + if (atomic_read(&device->suspend_cnt)) return false; /* to avoid potential deadlock or bitmap corruption, |