X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpinger.c;h=1c3255565dde442f06d11a488e956241159130bd;hb=294e507d34de0d7990ec507334f71ff1d1a7db01;hp=f5241f26090802354d1483000b95ede4934dab67;hpb=adc6a5e76348d9bb1c8355103f419405a14decca;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c index f5241f2..1c32555 100644 --- a/lustre/ptlrpc/pinger.c +++ b/lustre/ptlrpc/pinger.c @@ -802,9 +802,9 @@ static int pinger_check_rpcs(void *arg) pd->pd_this_ping = curtime; mutex_unlock(&pinger_mutex); - /* Might be empty, that's OK. */ - if (cfs_atomic_read(&set->set_remaining) == 0) - CDEBUG(D_RPCTRACE, "nothing to ping\n"); + /* Might be empty, that's OK. */ + if (atomic_read(&set->set_remaining) == 0) + CDEBUG(D_RPCTRACE, "nothing to ping\n"); cfs_list_for_each(iter, &set->set_requests) { struct ptlrpc_request *req = @@ -849,10 +849,10 @@ do_check_set: spin_lock(&imp->imp_lock); if (!cfs_list_empty(&req->rq_list)) { cfs_list_del_init(&req->rq_list); - cfs_atomic_dec(&imp->imp_inflight); + atomic_dec(&imp->imp_inflight); } spin_unlock(&imp->imp_lock); - cfs_atomic_dec(&set->set_remaining); + atomic_dec(&set->set_remaining); } mutex_unlock(&pinger_mutex);