|
@@ -1005,7 +1005,7 @@ static bool osd_registered(struct ceph_osd *osd)
|
|
|
*/
|
|
|
static void osd_init(struct ceph_osd *osd)
|
|
|
{
|
|
|
- atomic_set(&osd->o_ref, 1);
|
|
|
+ refcount_set(&osd->o_ref, 1);
|
|
|
RB_CLEAR_NODE(&osd->o_node);
|
|
|
osd->o_requests = RB_ROOT;
|
|
|
osd->o_linger_requests = RB_ROOT;
|
|
@@ -1050,9 +1050,9 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum)
|
|
|
|
|
|
static struct ceph_osd *get_osd(struct ceph_osd *osd)
|
|
|
{
|
|
|
- if (atomic_inc_not_zero(&osd->o_ref)) {
|
|
|
- dout("get_osd %p %d -> %d\n", osd, atomic_read(&osd->o_ref)-1,
|
|
|
- atomic_read(&osd->o_ref));
|
|
|
+ if (refcount_inc_not_zero(&osd->o_ref)) {
|
|
|
+ dout("get_osd %p %d -> %d\n", osd, refcount_read(&osd->o_ref)-1,
|
|
|
+ refcount_read(&osd->o_ref));
|
|
|
return osd;
|
|
|
} else {
|
|
|
dout("get_osd %p FAIL\n", osd);
|
|
@@ -1062,9 +1062,9 @@ static struct ceph_osd *get_osd(struct ceph_osd *osd)
|
|
|
|
|
|
static void put_osd(struct ceph_osd *osd)
|
|
|
{
|
|
|
- dout("put_osd %p %d -> %d\n", osd, atomic_read(&osd->o_ref),
|
|
|
- atomic_read(&osd->o_ref) - 1);
|
|
|
- if (atomic_dec_and_test(&osd->o_ref)) {
|
|
|
+ dout("put_osd %p %d -> %d\n", osd, refcount_read(&osd->o_ref),
|
|
|
+ refcount_read(&osd->o_ref) - 1);
|
|
|
+ if (refcount_dec_and_test(&osd->o_ref)) {
|
|
|
osd_cleanup(osd);
|
|
|
kfree(osd);
|
|
|
}
|
|
@@ -4126,7 +4126,7 @@ void ceph_osdc_stop(struct ceph_osd_client *osdc)
|
|
|
close_osd(osd);
|
|
|
}
|
|
|
up_write(&osdc->lock);
|
|
|
- WARN_ON(atomic_read(&osdc->homeless_osd.o_ref) != 1);
|
|
|
+ WARN_ON(refcount_read(&osdc->homeless_osd.o_ref) != 1);
|
|
|
osd_cleanup(&osdc->homeless_osd);
|
|
|
|
|
|
WARN_ON(!list_empty(&osdc->osd_lru));
|