From: dongdong tao Date: Sat, 30 Dec 2017 13:01:47 +0000 (+0800) Subject: mds: clean up log's function name for CDentry.cc X-Git-Tag: v13.0.2~590^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc2ed13123a486b38f9bd7e3960aa3e46e82111e;p=ceph.git mds: clean up log's function name for CDentry.cc Signed-off-by: dongdong tao --- diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc index 7d2473493158..71b9d71812a0 100644 --- a/src/mds/CDentry.cc +++ b/src/mds/CDentry.cc @@ -149,7 +149,7 @@ void CDentry::add_waiter(uint64_t tag, MDSInternalContextBase *c) version_t CDentry::pre_dirty(version_t min) { projected_version = dir->pre_dirty(min); - dout(10) << " pre_dirty " << *this << dendl; + dout(10) << __func__ << " " << *this << dendl; return projected_version; } @@ -169,7 +169,7 @@ void CDentry::_mark_dirty(LogSegment *ls) void CDentry::mark_dirty(version_t pv, LogSegment *ls) { - dout(10) << " mark_dirty " << *this << dendl; + dout(10) << __func__ << " " << *this << dendl; // i now live in this new dir version assert(pv <= projected_version); @@ -183,7 +183,7 @@ void CDentry::mark_dirty(version_t pv, LogSegment *ls) void CDentry::mark_clean() { - dout(10) << " mark_clean " << *this << dendl; + dout(10) << __func__ << " " << *this << dendl; assert(is_dirty()); // not always true for recalc_auth_bits during resolve finish @@ -201,7 +201,7 @@ void CDentry::mark_clean() void CDentry::mark_new() { - dout(10) << " mark_new " << *this << dendl; + dout(10) << __func__ << " " << *this << dendl; state_set(STATE_NEW); } @@ -373,7 +373,7 @@ void CDentry::adjust_nested_auth_pins(int adjustment, int diradj, void *by) { nested_auth_pins += adjustment; - dout(35) << "adjust_nested_auth_pins by " << by + dout(35) << __func__ << " by " << by << ", change " << adjustment << " yields " << auth_pins << "+" << nested_auth_pins << dendl; @@ -457,7 +457,7 @@ void CDentry::decode_lock_state(int type, bufferlist& bl) ::decode(newfirst, p); if (!is_auth() && newfirst != first) { - dout(10) << "decode_lock_state first " << first << " -> " << newfirst << dendl; + dout(10) << __func__ << " first " << first << " -> " << newfirst << dendl; assert(newfirst > first); first = newfirst; } @@ -479,7 +479,7 @@ void CDentry::decode_lock_state(int type, bufferlist& bl) // newly linked? if (linkage.is_null() && !is_auth()) { // force trim from cache! - dout(10) << "decode_lock_state replica dentry null -> non-null, must trim" << dendl; + dout(10) << __func__ << " replica dentry null -> non-null, must trim" << dendl; //assert(get_num_ref() == 0); } else { // verify? @@ -498,7 +498,7 @@ ClientLease *CDentry::add_client_lease(client_t c, Session *session) if (client_lease_map.count(c)) l = client_lease_map[c]; else { - dout(20) << "add_client_lease client." << c << " on " << lock << dendl; + dout(20) << __func__ << " client." << c << " on " << lock << dendl; if (client_lease_map.empty()) { get(PIN_CLIENTLEASE); lock.get_client_lease(); @@ -517,7 +517,7 @@ void CDentry::remove_client_lease(ClientLease *l, Locker *locker) bool gather = false; - dout(20) << "remove_client_lease client." << l->client << " on " << lock << dendl; + dout(20) << __func__ << " client." << l->client << " on " << lock << dendl; client_lease_map.erase(l->client); l->item_lease.remove_myself();