libceph: rename r_unsafe_item to r_private_item
This list item remained from when we had safe and unsafe replies (commit vs ack). It has since become a private list item for use by clients. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
parent
0192ce2ee6
commit
94e8577188
|
@ -1026,7 +1026,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
|
|||
req->r_callback = ceph_aio_complete_req;
|
||||
req->r_inode = inode;
|
||||
req->r_priv = aio_req;
|
||||
list_add_tail(&req->r_unsafe_item, &aio_req->osd_reqs);
|
||||
list_add_tail(&req->r_private_item, &aio_req->osd_reqs);
|
||||
|
||||
pos += len;
|
||||
continue;
|
||||
|
@ -1086,8 +1086,8 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
|
|||
while (!list_empty(&osd_reqs)) {
|
||||
req = list_first_entry(&osd_reqs,
|
||||
struct ceph_osd_request,
|
||||
r_unsafe_item);
|
||||
list_del_init(&req->r_unsafe_item);
|
||||
r_private_item);
|
||||
list_del_init(&req->r_private_item);
|
||||
if (ret >= 0)
|
||||
ret = ceph_osdc_start_request(req->r_osdc,
|
||||
req, false);
|
||||
|
|
|
@ -198,9 +198,9 @@ struct ceph_osd_request {
|
|||
bool r_mempool;
|
||||
struct completion r_completion; /* private to osd_client.c */
|
||||
ceph_osdc_callback_t r_callback;
|
||||
struct list_head r_unsafe_item;
|
||||
|
||||
struct inode *r_inode; /* for use by callbacks */
|
||||
struct list_head r_private_item; /* ditto */
|
||||
void *r_priv; /* ditto */
|
||||
|
||||
/* set by submitter */
|
||||
|
|
|
@ -478,7 +478,7 @@ static void request_release_checks(struct ceph_osd_request *req)
|
|||
{
|
||||
WARN_ON(!RB_EMPTY_NODE(&req->r_node));
|
||||
WARN_ON(!RB_EMPTY_NODE(&req->r_mc_node));
|
||||
WARN_ON(!list_empty(&req->r_unsafe_item));
|
||||
WARN_ON(!list_empty(&req->r_private_item));
|
||||
WARN_ON(req->r_osd);
|
||||
}
|
||||
|
||||
|
@ -538,7 +538,7 @@ static void request_init(struct ceph_osd_request *req)
|
|||
init_completion(&req->r_completion);
|
||||
RB_CLEAR_NODE(&req->r_node);
|
||||
RB_CLEAR_NODE(&req->r_mc_node);
|
||||
INIT_LIST_HEAD(&req->r_unsafe_item);
|
||||
INIT_LIST_HEAD(&req->r_private_item);
|
||||
|
||||
target_init(&req->r_t);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue