drbd: Track the reasons to suspend IO in dedicated state bits

There are three ways to get IO suspended:

 * Loss of any access to data
 * Fence-peer-handler running
 * User requested to suspend IO

Track those in different bits, so that one condition clearing its
state bit does not interfere with the other two conditions.

Only when the user resumes IO he overrules all three bits.

The fact is hidden from the user, he sees only a single suspend
bit.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index af608b39c4e0..9e91a2545fc8 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -287,7 +287,7 @@ static void _req_may_be_done_not_susp(struct drbd_request *req, struct bio_and_e
 {
         struct drbd_conf *mdev = req->mdev;
 
-        if (!mdev->state.susp)
+        if (!is_susp(mdev->state))
                 _req_may_be_done(req, m);
 }
 
@@ -812,7 +812,7 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio)
                             (mdev->state.pdsk == D_INCONSISTENT &&
                              mdev->state.conn >= C_CONNECTED));
 
-        if (!(local || remote) && !mdev->state.susp) {
+        if (!(local || remote) && !is_susp(mdev->state)) {
                 dev_err(DEV, "IO ERROR: neither local nor remote disk\n");
                 goto fail_free_complete;
         }
@@ -838,7 +838,7 @@ allocate_barrier:
         /* GOOD, everything prepared, grab the spin_lock */
         spin_lock_irq(&mdev->req_lock);
 
-        if (mdev->state.susp) {
+        if (is_susp(mdev->state)) {
                 /* If we got suspended, use the retry mechanism of
                    generic_make_request() to restart processing of this
                    bio. In the next call to drbd_make_request_26