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_req.h | |
| 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_req.h')
| -rw-r--r-- | drivers/block/drbd/drbd_req.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h index 7fb3e06369d2..0dabfa9c82f3 100644 --- a/drivers/block/drbd/drbd_req.h +++ b/drivers/block/drbd/drbd_req.h @@ -295,7 +295,7 @@ static inline int req_mod(struct drbd_request *req, return rv; } -static inline bool drbd_should_do_remote(union drbd_state s) +static inline bool drbd_should_do_remote(union drbd_dev_state s) { return s.pdsk == D_UP_TO_DATE || (s.pdsk >= D_INCONSISTENT && @@ -305,7 +305,7 @@ static inline bool drbd_should_do_remote(union drbd_state s) That is equivalent since before 96 IO was frozen in the C_WF_BITMAP* states. */ } -static inline bool drbd_should_send_out_of_sync(union drbd_state s) +static inline bool drbd_should_send_out_of_sync(union drbd_dev_state s) { return s.conn == C_AHEAD || s.conn == C_WF_BITMAP_S; /* pdsk = D_INCONSISTENT as a consequence. Protocol 96 check not necessary |