renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

ceph: use kref for ceph_osd_request

Browse Source 
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2009-12-07 13:37:03 -08:00
parent 153c8e6bf7
commit 415e49a9c4
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fs/ceph/osd_client.c
View File

@ -77,25 +77,24 @@ static void calc_layout(struct ceph_osd_client *osdc,
/* /*
* requests * requests
*/ */
void ceph_osdc_put_request(struct ceph_osd_request *req) void ceph_osdc_release_request(struct kref *kref)
{ {
dout("osdc put_request %p %d -> %d\n", req, atomic_read(&req->r_ref), struct ceph_osd_request *req = container_of(kref,
atomic_read(&req->r_ref)-1); struct ceph_osd_request,
BUG_ON(atomic_read(&req->r_ref) <= 0); r_kref);
if (atomic_dec_and_test(&req->r_ref)) {
if (req->r_request) if (req->r_request)
ceph_msg_put(req->r_request); ceph_msg_put(req->r_request);
if (req->r_reply) if (req->r_reply)
ceph_msg_put(req->r_reply); ceph_msg_put(req->r_reply);
if (req->r_own_pages) if (req->r_own_pages)
ceph_release_page_vector(req->r_pages, ceph_release_page_vector(req->r_pages,
req->r_num_pages); req->r_num_pages);
ceph_put_snap_context(req->r_snapc); ceph_put_snap_context(req->r_snapc);
if (req->r_mempool) if (req->r_mempool)
mempool_free(req, req->r_osdc->req_mempool); mempool_free(req, req->r_osdc->req_mempool);
else else
kfree(req); kfree(req);
}
} }
/* /*
@ -149,7 +148,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
req->r_osdc = osdc; req->r_osdc = osdc;
req->r_mempool = use_mempool; req->r_mempool = use_mempool;
atomic_set(&req->r_ref, 1); kref_init(&req->r_kref);
init_completion(&req->r_completion); init_completion(&req->r_completion);
init_completion(&req->r_safe_completion); init_completion(&req->r_safe_completion);
INIT_LIST_HEAD(&req->r_unsafe_item); INIT_LIST_HEAD(&req->r_unsafe_item);

11
fs/ceph/osd_client.h
View File

@ -2,6 +2,7 @@
#define _FS_CEPH_OSD_CLIENT_H #define _FS_CEPH_OSD_CLIENT_H
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/kref.h>
#include <linux/mempool.h> #include <linux/mempool.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
@ -49,7 +50,7 @@ struct ceph_osd_request {
int r_prepared_pages, r_got_reply; int r_prepared_pages, r_got_reply;
struct ceph_osd_client *r_osdc; struct ceph_osd_client *r_osdc;
atomic_t r_ref; struct kref r_kref;
bool r_mempool; bool r_mempool;
struct completion r_completion, r_safe_completion; struct completion r_completion, r_safe_completion;
ceph_osdc_callback_t r_callback, r_safe_callback; ceph_osdc_callback_t r_callback, r_safe_callback;
@ -118,9 +119,13 @@ extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,
static inline void ceph_osdc_get_request(struct ceph_osd_request *req) static inline void ceph_osdc_get_request(struct ceph_osd_request *req)
{ {
atomic_inc(&req->r_ref); kref_get(&req->r_kref);
}
extern void ceph_osdc_release_request(struct kref *kref);
static inline void ceph_osdc_put_request(struct ceph_osd_request *req)
{
kref_put(&req->r_kref, ceph_osdc_release_request);
} }
extern void ceph_osdc_put_request(struct ceph_osd_request *req);
extern int ceph_osdc_start_request(struct ceph_osd_client *osdc, extern int ceph_osdc_start_request(struct ceph_osd_client *osdc,
struct ceph_osd_request *req, struct ceph_osd_request *req,