Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

client: fix display ino in the ldout #15314

Merged
merged 1 commit into from Jun 1, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/client/Client.cc
Expand Up @@ -9919,7 +9919,8 @@ int Client::ll_lookup(Inode *parent, const char *name, struct stat *attr,
Inode **out, const UserPerm& perms)
{
Mutex::Locker lock(client_lock);
ldout(cct, 3) << "ll_lookup " << parent << " " << name << dendl;
vinodeno_t vparent = _get_vino(parent);
ldout(cct, 3) << "ll_lookup " << vparent << " " << name << dendl;
tout(cct) << "ll_lookup" << std::endl;
tout(cct) << name << std::endl;

Expand All @@ -9944,7 +9945,7 @@ int Client::ll_lookup(Inode *parent, const char *name, struct stat *attr,
_ll_get(in.get());

out:
ldout(cct, 3) << "ll_lookup " << parent << " " << name
ldout(cct, 3) << "ll_lookup " << vparent << " " << name
<< " -> " << r << " (" << hex << attr->st_ino << dec << ")" << dendl;
tout(cct) << attr->st_ino << std::endl;
*out = in.get();
Expand All @@ -9956,7 +9957,8 @@ int Client::ll_lookupx(Inode *parent, const char *name, Inode **out,
const UserPerm& perms)
{
Mutex::Locker lock(client_lock);
ldout(cct, 3) << "ll_lookupx " << parent << " " << name << dendl;
vinodeno_t vparent = _get_vino(parent);
ldout(cct, 3) << "ll_lookupx " << vparent << " " << name << dendl;
tout(cct) << "ll_lookupx" << std::endl;
tout(cct) << name << std::endl;

Expand All @@ -9981,7 +9983,7 @@ int Client::ll_lookupx(Inode *parent, const char *name, Inode **out,
_ll_get(in.get());
}

ldout(cct, 3) << "ll_lookupx " << parent << " " << name
ldout(cct, 3) << "ll_lookupx " << vparent << " " << name
<< " -> " << r << " (" << hex << stx->stx_ino << dec << ")" << dendl;
tout(cct) << stx->stx_ino << std::endl;
*out = in.get();
Expand Down Expand Up @@ -11765,7 +11767,7 @@ int Client::ll_link(Inode *in, Inode *newparent, const char *newname,
vinodeno_t vino = _get_vino(in);
vinodeno_t vnewparent = _get_vino(newparent);

ldout(cct, 3) << "ll_link " << in << " to " << vnewparent << " " <<
ldout(cct, 3) << "ll_link " << vino << " to " << vnewparent << " " <<
newname << dendl;
tout(cct) << "ll_link" << std::endl;
tout(cct) << vino.ino.val << std::endl;
Expand Down Expand Up @@ -12037,7 +12039,7 @@ int Client::_ll_create(Inode *parent, const char *name, mode_t mode,

tout(cct) << (unsigned long)*fhp << std::endl;
tout(cct) << ino << std::endl;
ldout(cct, 3) << "_ll_create " << parent << " " << name << " 0" << oct <<
ldout(cct, 3) << "_ll_create " << vparent << " " << name << " 0" << oct <<
mode << dec << " " << ceph_flags_sys2wire(flags) << " = " << r << " (" <<
*fhp << " " << hex << ino << dec << ")" << dendl;

Expand Down