diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-28 16:18:39 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:45:03 +0100 |
| commit | 8e0af25fa85c9efe393128b0a0dd874981edb22f (patch) | |
| tree | e7496473c3cb9b93410e678925c0bd26e8722e8e /drivers/block | |
| parent | drbd: Renamed id_susp(union drbd_state s) to drbd_suspended(struct drbd_conf *) (diff) | |
| download | linux-8e0af25fa85c9efe393128b0a0dd874981edb22f.tar.xz linux-8e0af25fa85c9efe393128b0a0dd874981edb22f.zip | |
drbd: Moved susp, susp_nod and susp_fen to the connection object
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 10 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index cde547bdddf1..f76b3932d1e2 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -862,6 +862,9 @@ struct drbd_tconn { /* is a resource from the config file */ struct list_head all_tconn; /* linked on global drbd_tconns */ struct idr volumes; /* <tconn, vnr> to mdev mapping */ enum drbd_conns cstate; /* Only C_STANDALONE to C_WF_REPORT_PARAMS */ + unsigned susp:1; /* IO suspended by user */ + unsigned susp_nod:1; /* IO suspended because no data */ + unsigned susp_fen:1; /* IO suspended because fence peer handler runs */ struct mutex cstate_mutex; /* Protects graceful disconnects */ unsigned long flags; @@ -1687,6 +1690,9 @@ static inline union drbd_state drbd_read_state(struct drbd_conf *mdev) union drbd_state rv; rv = mdev->state; + rv.susp = mdev->tconn->susp; + rv.susp_nod = mdev->tconn->susp_nod; + rv.susp_fen = mdev->tconn->susp_fen; return rv; } @@ -2219,7 +2225,9 @@ static inline int drbd_state_is_stable(struct drbd_conf *mdev) static inline int drbd_suspended(struct drbd_conf *mdev) { - return mdev->state.susp || mdev->state.susp_nod || mdev->state.susp_fen; + struct drbd_tconn *tconn = mdev->tconn; + + return tconn->susp || tconn->susp_fen || tconn->susp_nod; } static inline bool may_inc_ap_bio(struct drbd_conf *mdev) diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index ae4a76ce8c1d..902007c807ea 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -861,6 +861,9 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns, atomic_inc(&mdev->local_cnt); mdev->state = ns; + mdev->tconn->susp = ns.susp; + mdev->tconn->susp_nod = ns.susp_nod; + mdev->tconn->susp_fen = ns.susp_fen; /* solve the race between becoming unconfigured, * worker doing the cleanup, and |