diff options
| author | Philipp Reisner | 2011-03-29 10:52:01 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:45:04 +0100 |
| commit | da9fbc276e9d42638df68e8515d06750695612ca (patch) | |
| tree | e937b9f5e617ae8ea40bb1ac3d79ed11849e55c7 /drivers/block/drbd/drbd_state.c | |
| parent | drbd: Moved susp, susp_nod and susp_fen to the connection object (diff) | |
| download | kernel-qcow2-linux-da9fbc276e9d42638df68e8515d06750695612ca.tar.gz kernel-qcow2-linux-da9fbc276e9d42638df68e8515d06750695612ca.tar.xz kernel-qcow2-linux-da9fbc276e9d42638df68e8515d06750695612ca.zip | |
drbd: Introduced a new type union drbd_dev_state
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 902007c807ea..b6a14a30ba27 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -860,7 +860,7 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns, (os.disk != D_DISKLESS && ns.disk == D_DISKLESS)) atomic_inc(&mdev->local_cnt); - mdev->state = ns; + mdev->state.i = ns.i; mdev->tconn->susp = ns.susp; mdev->tconn->susp_nod = ns.susp_nod; mdev->tconn->susp_fen = ns.susp_fen; @@ -1393,7 +1393,7 @@ static int w_after_conn_state_ch(struct drbd_work *w, int unused) void conn_old_common_state(struct drbd_tconn *tconn, union drbd_state *pcs, enum chg_state_flags *pf) { enum chg_state_flags flags = ~0; - union drbd_state os, cs = {}; /* old_state, common_state */ + union drbd_dev_state os, cs = {}; /* old_state, common_state */ struct drbd_conf *mdev; int vnr, first_vol = 1; @@ -1424,7 +1424,7 @@ void conn_old_common_state(struct drbd_tconn *tconn, union drbd_state *pcs, enum *pf |= CS_DC_MASK; *pf &= flags; - *pcs = cs; + (*pcs).i = cs.i; } static enum drbd_state_rv |