aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2010-12-19 17:53:14 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 10:44:50 -0500
commit8f7bed77740c7418074e6ba82c646a7dd035e6cf (patch)
treed3e429d72b8330e128dee76613b06b2e21d64d98 /drivers/block/drbd/drbd_req.c
parent0da34df0d05d004c1ec40f4c30a325d8727b0b33 (diff)
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,
477 477
478 case QUEUE_FOR_SEND_OOS: 478 case QUEUE_FOR_SEND_OOS:
479 req->rq_state |= RQ_NET_QUEUED; 479 req->rq_state |= RQ_NET_QUEUED;
480 req->w.cb = w_send_oos; 480 req->w.cb = w_send_out_of_sync;
481 drbd_queue_work(&mdev->tconn->data.work, &req->w); 481 drbd_queue_work(&mdev->tconn->data.work, &req->w);
482 break; 482 break;
483 483
@@ -786,7 +786,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s
786 } 786 }
787 787
788 remote = remote && drbd_should_do_remote(mdev->state); 788 remote = remote && drbd_should_do_remote(mdev->state);
789 send_oos = rw == WRITE && drbd_should_send_oos(mdev->state); 789 send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state);
790 D_ASSERT(!(remote && send_oos)); 790 D_ASSERT(!(remote && send_oos));
791 791
792 if (!(local || remote) && !is_susp(mdev->state)) { 792 if (!(local || remote) && !is_susp(mdev->state)) {
@@ -842,7 +842,7 @@ allocate_barrier:
842 842
843 if (remote || send_oos) { 843 if (remote || send_oos) {
844 remote = drbd_should_do_remote(mdev->state); 844 remote = drbd_should_do_remote(mdev->state);
845 send_oos = rw == WRITE && drbd_should_send_oos(mdev->state); 845 send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state);
846 D_ASSERT(!(remote && send_oos)); 846 D_ASSERT(!(remote && send_oos));
847 847
848 if (!(remote || send_oos)) 848 if (!(remote || send_oos))