diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-02-17 10:46:59 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-10-14 10:47:36 -0400 |
commit | fcefa62e4c26e70c70b9e8252a4bc9b9031a4182 (patch) | |
tree | b4753bfb7342205687aca576bf424df0131f9747 /drivers/block/drbd/drbd_receiver.c | |
parent | fbe29dec98622369c106ba72279500fb2f5aba99 (diff) |
drbd: Rename drbd_endio_{pri,sec} -> drbd_{,peer_}request_endio
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_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 6b00650d2805..1547c5106ab7 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -1136,7 +1136,7 @@ next_bio: | |||
1136 | bio->bi_bdev = mdev->ldev->backing_bdev; | 1136 | bio->bi_bdev = mdev->ldev->backing_bdev; |
1137 | bio->bi_rw = rw; | 1137 | bio->bi_rw = rw; |
1138 | bio->bi_private = peer_req; | 1138 | bio->bi_private = peer_req; |
1139 | bio->bi_end_io = drbd_endio_sec; | 1139 | bio->bi_end_io = drbd_peer_request_endio; |
1140 | 1140 | ||
1141 | bio->bi_next = bios; | 1141 | bio->bi_next = bios; |
1142 | bios = bio; | 1142 | bios = bio; |
@@ -1572,7 +1572,7 @@ static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packet cmd, | |||
1572 | if (get_ldev(mdev)) { | 1572 | if (get_ldev(mdev)) { |
1573 | /* data is submitted to disk within recv_resync_read. | 1573 | /* data is submitted to disk within recv_resync_read. |
1574 | * corresponding put_ldev done below on error, | 1574 | * corresponding put_ldev done below on error, |
1575 | * or in drbd_endio_sec. */ | 1575 | * or in drbd_peer_request_endio. */ |
1576 | ok = recv_resync_read(mdev, sector, data_size); | 1576 | ok = recv_resync_read(mdev, sector, data_size); |
1577 | } else { | 1577 | } else { |
1578 | if (__ratelimit(&drbd_ratelimit_state)) | 1578 | if (__ratelimit(&drbd_ratelimit_state)) |
@@ -1760,10 +1760,11 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packet cmd, | |||
1760 | return drbd_drain_block(mdev, data_size); | 1760 | return drbd_drain_block(mdev, data_size); |
1761 | } | 1761 | } |
1762 | 1762 | ||
1763 | /* get_ldev(mdev) successful. | 1763 | /* |
1764 | * Corresponding put_ldev done either below (on various errors), | 1764 | * Corresponding put_ldev done either below (on various errors), or in |
1765 | * or in drbd_endio_sec, if we successfully submit the data at | 1765 | * drbd_peer_request_endio, if we successfully submit the data at the |
1766 | * the end of this function. */ | 1766 | * end of this function. |
1767 | */ | ||
1767 | 1768 | ||
1768 | sector = be64_to_cpu(p->sector); | 1769 | sector = be64_to_cpu(p->sector); |
1769 | peer_req = read_in_block(mdev, p->block_id, sector, data_size); | 1770 | peer_req = read_in_block(mdev, p->block_id, sector, data_size); |