libceph: add spinlock around osd->o_requests
In a later patch, we're going to need to search for a request in the rbtree, but taking the o_mutex is inconvenient as we already hold the con mutex at the point where we need it. Add a new spinlock that we take when inserting and erasing entries from the o_requests tree. Search of the rbtree can be done with either the mutex or the spinlock, but insertion and removal requires both. Signed-off-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: Xiubo Li <xiubli@redhat.com> Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de> Reviewed-by: Milind Changire <mchangir@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
committed by
Ilya Dryomov
parent
706a741595
commit
08b8a0440e
@@ -29,7 +29,12 @@ typedef void (*ceph_osdc_callback_t)(struct ceph_osd_request *);
|
||||
|
||||
#define CEPH_HOMELESS_OSD -1
|
||||
|
||||
/* a given osd we're communicating with */
|
||||
/*
|
||||
* A given osd we're communicating with.
|
||||
*
|
||||
* Note that the o_requests tree can be searched while holding the "lock" mutex
|
||||
* or the "o_requests_lock" spinlock. Insertion or removal requires both!
|
||||
*/
|
||||
struct ceph_osd {
|
||||
refcount_t o_ref;
|
||||
struct ceph_osd_client *o_osdc;
|
||||
@@ -37,6 +42,7 @@ struct ceph_osd {
|
||||
int o_incarnation;
|
||||
struct rb_node o_node;
|
||||
struct ceph_connection o_con;
|
||||
spinlock_t o_requests_lock;
|
||||
struct rb_root o_requests;
|
||||
struct rb_root o_linger_requests;
|
||||
struct rb_root o_backoff_mappings;
|
||||
|
||||
Reference in New Issue
Block a user