On 06/25/2014 12:16 PM, Ilya Dryomov wrote:
> So that:
>
> req->r_osd_item --> osd->o_requests list
> req->r_linger_osd_item --> osd->o_linger_requests list
>
> Signed-off-by: Ilya Dryomov <ilya.dryomov@xxxxxxxxxxx>
This looks good and I prefer it too.
Reviewed-by: Alex Elder <elder@xxxxxxxxxx>
> ---
> include/linux/ceph/osd_client.h | 2 +-
> net/ceph/osd_client.c | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
> index 94ec69672164..7490a03ac163 100644
> --- a/include/linux/ceph/osd_client.h
> +++ b/include/linux/ceph/osd_client.h
> @@ -117,7 +117,7 @@ struct ceph_osd_request {
> struct list_head r_req_lru_item;
> struct list_head r_osd_item;
> struct list_head r_linger_item;
> - struct list_head r_linger_osd;
> + struct list_head r_linger_osd_item;
> struct ceph_osd *r_osd;
> struct ceph_pg r_pgid;
> int r_pg_osds[CEPH_PG_MAX_SIZE];
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index 05be0c181695..d5d2be3bd113 100644
> --- a/net/ceph/osd_client.c
> +++ b/net/ceph/osd_client.c
> @@ -364,7 +364,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
> RB_CLEAR_NODE(&req->r_node);
> INIT_LIST_HEAD(&req->r_unsafe_item);
> INIT_LIST_HEAD(&req->r_linger_item);
> - INIT_LIST_HEAD(&req->r_linger_osd);
> + INIT_LIST_HEAD(&req->r_linger_osd_item);
> INIT_LIST_HEAD(&req->r_req_lru_item);
> INIT_LIST_HEAD(&req->r_osd_item);
>
> @@ -916,7 +916,7 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc,
> * list at the end to keep things in tid order.
> */
> list_for_each_entry_safe(req, nreq, &osd->o_linger_requests,
> - r_linger_osd) {
> + r_linger_osd_item) {
> /*
> * reregister request prior to unregistering linger so
> * that r_osd is preserved.
> @@ -1218,7 +1218,7 @@ static void __register_linger_request(struct ceph_osd_client *osdc,
> ceph_osdc_get_request(req);
> list_add_tail(&req->r_linger_item, &osdc->req_linger);
> if (req->r_osd)
> - list_add_tail(&req->r_linger_osd,
> + list_add_tail(&req->r_linger_osd_item,
> &req->r_osd->o_linger_requests);
> }
>
> @@ -1228,7 +1228,7 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
> dout("__unregister_linger_request %p\n", req);
> list_del_init(&req->r_linger_item);
> if (req->r_osd) {
> - list_del_init(&req->r_linger_osd);
> + list_del_init(&req->r_linger_osd_item);
>
> if (list_empty(&req->r_osd->o_requests) &&
> list_empty(&req->r_osd->o_linger_requests)) {
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
