Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / drivers / block / drbd / drbd_req.c

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index de81ab7b4627adf45f4bafe8dbd907a28158fe89..3397f11d0ba915fd29ca9cd6f65717d2f6a83f10 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -722,6 +722,7 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio)
        struct drbd_request *req;
        int local, remote;
        int err = -EIO;
+       int ret = 0;
 
        /* allocate outside of all locks; */
        req = drbd_req_new(mdev, bio);
@@ -784,7 +785,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)) {
+       if (!(local || remote) && !mdev->state.susp) {
                dev_err(DEV, "IO ERROR: neither local nor remote disk\n");
                goto fail_free_complete;
        }
@@ -810,6 +811,16 @@ allocate_barrier:
        /* GOOD, everything prepared, grab the spin_lock */
        spin_lock_irq(&mdev->req_lock);
 
+       if (mdev->state.susp) {
+               /* 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
+                  we sleep in inc_ap_bio() */
+               ret = 1;
+               spin_unlock_irq(&mdev->req_lock);
+               goto fail_free_complete;
+       }
+
        if (remote) {
                remote = (mdev->state.pdsk == D_UP_TO_DATE ||
                            (mdev->state.pdsk == D_INCONSISTENT &&
@@ -947,12 +958,14 @@ fail_and_free_req:
                req->private_bio = NULL;
                put_ldev(mdev);
        }
-       bio_endio(bio, err);
+       if (!ret)
+               bio_endio(bio, err);
+
        drbd_req_free(req);
        dec_ap_bio(mdev);
        kfree(b);
 
-       return 0;
+       return ret;
 }
 
 /* helper function for drbd_make_request
@@ -962,11 +975,6 @@ fail_and_free_req:
  */
 static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write)
 {
-       /* Unconfigured */
-       if (mdev->state.conn == C_DISCONNECTING &&
-           mdev->state.disk == D_DISKLESS)
-               return 1;
-
        if (mdev->state.role != R_PRIMARY &&
                (!allow_oos || is_write)) {
                if (__ratelimit(&drbd_ratelimit_state)) {
@@ -1070,15 +1078,21 @@ int drbd_make_request_26(struct request_queue *q, struct bio *bio)
 
                /* we need to get a "reference count" (ap_bio_cnt)
                 * to avoid races with the disconnect/reconnect/suspend code.
-                * In case we need to split the bio here, we need to get two references
+                * In case we need to split the bio here, we need to get three references
                 * atomically, otherwise we might deadlock when trying to submit the
                 * second one! */
-               inc_ap_bio(mdev, 2);
+               inc_ap_bio(mdev, 3);
 
                D_ASSERT(e_enr == s_enr + 1);
 
-               drbd_make_request_common(mdev, &bp->bio1);
-               drbd_make_request_common(mdev, &bp->bio2);
+               while (drbd_make_request_common(mdev, &bp->bio1))
+                       inc_ap_bio(mdev, 1);
+
+               while (drbd_make_request_common(mdev, &bp->bio2))
+                       inc_ap_bio(mdev, 1);
+
+               dec_ap_bio(mdev);
+
                bio_pair_release(bp);
        }
        return 0;
@@ -1115,7 +1129,7 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
        } else if (limit && get_ldev(mdev)) {
                struct request_queue * const b =
                        mdev->ldev->backing_bdev->bd_disk->queue;
-               if (b->merge_bvec_fn && mdev->ldev->dc.use_bmbv) {
+               if (b->merge_bvec_fn) {
                        backing_limit = b->merge_bvec_fn(b, bvm, bvec);
                        limit = min(limit, backing_limit);
                }