summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher2010-12-19 23:53:14 +0100
committerPhilipp Reisner2012-11-08 16:44:50 +0100
commit8f7bed77740c7418074e6ba82c646a7dd035e6cf (patch)
treed3e429d72b8330e128dee76613b06b2e21d64d98 /drivers/block/drbd/drbd_req.c
parentdrbd: drbd_may_do_local_read(): Use bool/true/false (diff)
downloadkernel-qcow2-linux-8f7bed77740c7418074e6ba82c646a7dd035e6cf.tar.gz
kernel-qcow2-linux-8f7bed77740c7418074e6ba82c646a7dd035e6cf.tar.xz
kernel-qcow2-linux-8f7bed77740c7418074e6ba82c646a7dd035e6cf.zip
drbd: Rename various functions from *_oos_* to *_out_of_sync_* for clarity
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 3430dab85720..e380ffb7f4fc 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -477,7 +477,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
case QUEUE_FOR_SEND_OOS:
req->rq_state |= RQ_NET_QUEUED;
- req->w.cb = w_send_oos;
+ req->w.cb = w_send_out_of_sync;
drbd_queue_work(&mdev->tconn->data.work, &req->w);
break;
@@ -786,7 +786,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s
}
remote = remote && drbd_should_do_remote(mdev->state);
- send_oos = rw == WRITE && drbd_should_send_oos(mdev->state);
+ send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state);
D_ASSERT(!(remote && send_oos));
if (!(local || remote) && !is_susp(mdev->state)) {
@@ -842,7 +842,7 @@ allocate_barrier:
if (remote || send_oos) {
remote = drbd_should_do_remote(mdev->state);
- send_oos = rw == WRITE && drbd_should_send_oos(mdev->state);
+ send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state);
D_ASSERT(!(remote && send_oos));
if (!(remote || send_oos))