aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-03-28 16:48:11 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:45:03 +0100
commit2aebfabb17ecc434623732896a5834a9cb82a82d (patch)
tree4570cd92a9f257ee8255f076bd0ca48014dd738e /drivers/block/drbd/drbd_req.c
parent78bae59b1b7bc06c84e292e9ecf42c013723e057 (diff)
downloadvexpress-lsk-2aebfabb17ecc434623732896a5834a9cb82a82d.tar.gz
drbd: Renamed id_susp(union drbd_state s) to drbd_suspended(struct drbd_conf *)
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.c')
-rw-r--r--drivers/block/drbd/drbd_req.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 6e0e3bb3316..e296d7ed6b8 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -303,7 +303,7 @@ static void _req_may_be_done_not_susp(struct drbd_request *req, struct bio_and_e
{
struct drbd_conf *mdev = req->w.mdev;
- if (!is_susp(mdev->state))
+ if (!drbd_suspended(mdev))
_req_may_be_done(req, m);
}
@@ -789,7 +789,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s
send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state);
D_ASSERT(!(remote && send_oos));
- if (!(local || remote) && !is_susp(mdev->state)) {
+ if (!(local || remote) && !drbd_suspended(mdev)) {
if (__ratelimit(&drbd_ratelimit_state))
dev_err(DEV, "IO ERROR: neither local nor remote disk\n");
err = -EIO;
@@ -830,7 +830,7 @@ allocate_barrier:
}
}
- if (is_susp(mdev->state)) {
+ if (drbd_suspended(mdev)) {
/* 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