drbd: Code de-duplication; new function apply_mask_val()

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

diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 02516ed9127c4d359d8ff3df510c9a66760b0e8e..0100aab1288de6cc14822c1a4f9a229b1f290f17 100644 (file)
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -69,17 +69,24 @@ static int cl_wide_st_chg(struct drbd_conf *mdev,
                (os.conn == C_CONNECTED && ns.conn == C_VERIFY_S);
 }
 
+static union drbd_state
+apply_mask_val(union drbd_state os, union drbd_state mask, union drbd_state val)
+{
+       union drbd_state ns;
+       ns.i = (os.i & ~mask.i) | val.i;
+       return ns;
+}
+
 enum drbd_state_rv
 drbd_change_state(struct drbd_conf *mdev, enum chg_state_flags f,
                  union drbd_state mask, union drbd_state val)
 {
        unsigned long flags;
-       union drbd_state os, ns;
+       union drbd_state ns;
        enum drbd_state_rv rv;
 
        spin_lock_irqsave(&mdev->tconn->req_lock, flags);
-       os = mdev->state;
-       ns.i = (os.i & ~mask.i) | val.i;
+       ns = apply_mask_val(mdev->state, mask, val);
        rv = _drbd_set_state(mdev, ns, f, NULL);
        ns = mdev->state;
        spin_unlock_irqrestore(&mdev->tconn->req_lock, flags);
@@ -115,8 +122,7 @@ _req_st_cond(struct drbd_conf *mdev, union drbd_state mask,
 
        spin_lock_irqsave(&mdev->tconn->req_lock, flags);
        os = mdev->state;
-       ns.i = (os.i & ~mask.i) | val.i;
-       ns = sanitize_state(mdev, ns, NULL);
+       ns = sanitize_state(mdev, apply_mask_val(os, mask, val), NULL);
        rv = is_valid_transition(os, ns);
        if (rv == SS_SUCCESS)
                rv = SS_UNKNOWN_ERROR;  /* cont waiting, otherwise fail. */
@@ -162,8 +168,7 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask,
 
        spin_lock_irqsave(&mdev->tconn->req_lock, flags);
        os = mdev->state;
-       ns.i = (os.i & ~mask.i) | val.i;
-       ns = sanitize_state(mdev, ns, NULL);
+       ns = sanitize_state(mdev, apply_mask_val(os, mask, val), NULL);
        rv = is_valid_transition(os, ns);
        if (rv < SS_SUCCESS)
                goto abort;
@@ -199,8 +204,7 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask,
                        goto abort;
                }
                spin_lock_irqsave(&mdev->tconn->req_lock, flags);
-               os = mdev->state;
-               ns.i = (os.i & ~mask.i) | val.i;
+               ns = apply_mask_val(mdev->state, mask, val);
                rv = _drbd_set_state(mdev, ns, f, &done);
                drbd_state_unlock(mdev);
        } else {