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_req.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_req.c')
-rw-r--r-- | drivers/block/drbd/drbd_req.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 45a543e5c6a9..18eb3d17f174 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c | |||
@@ -116,7 +116,7 @@ static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const | |||
116 | drbd_set_in_sync(mdev, req->i.sector, req->i.size); | 116 | drbd_set_in_sync(mdev, req->i.sector, req->i.size); |
117 | 117 | ||
118 | /* one might be tempted to move the drbd_al_complete_io | 118 | /* one might be tempted to move the drbd_al_complete_io |
119 | * to the local io completion callback drbd_endio_pri. | 119 | * to the local io completion callback drbd_request_endio. |
120 | * but, if this was a mirror write, we may only | 120 | * but, if this was a mirror write, we may only |
121 | * drbd_al_complete_io after this is RQ_NET_DONE, | 121 | * drbd_al_complete_io after this is RQ_NET_DONE, |
122 | * otherwise the extent could be dropped from the al | 122 | * otherwise the extent could be dropped from the al |
@@ -252,7 +252,7 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m) | |||
252 | * what we need to do here is just: complete the master_bio. | 252 | * what we need to do here is just: complete the master_bio. |
253 | * | 253 | * |
254 | * local completion error, if any, has been stored as ERR_PTR | 254 | * local completion error, if any, has been stored as ERR_PTR |
255 | * in private_bio within drbd_endio_pri. | 255 | * in private_bio within drbd_request_endio. |
256 | */ | 256 | */ |
257 | int ok = (s & RQ_LOCAL_OK) || (s & RQ_NET_OK); | 257 | int ok = (s & RQ_LOCAL_OK) || (s & RQ_NET_OK); |
258 | int error = PTR_ERR(req->private_bio); | 258 | int error = PTR_ERR(req->private_bio); |