@@ -2115,28 +2115,23 @@ int MetadataDriver::find_or_create_dirfrag(
21152115 r = metadata_io.operate (frag_oid.name , &op);
21162116 if (r == -EOVERFLOW || r == -EEXIST) {
21172117 // Someone else wrote it (see case A above)
2118- dout (10 ) << " Dirfrag creation race: 0x" << std::hex
2119- << ino << " " << fragment << std::dec << dendl;
2118+ dout (10 ) << " Dirfrag creation race: " << ino << " ." << fragment << dendl;
21202119 *created = false ;
21212120 return 0 ;
21222121 } else if (r < 0 ) {
21232122 // We were unable to create or write it, error out
2124- derr << " Failed to create dirfrag 0x" << std::hex
2125- << ino << std::dec << " : " << cpp_strerror (r) << dendl;
2123+ derr << " Failed to create dirfrag " << ino << " : " << cpp_strerror (r) << dendl;
21262124 return r;
21272125 } else {
21282126 // Success: the dirfrag object now exists with a value header
2129- dout (10 ) << " Created dirfrag: 0x" << std::hex
2130- << ino << std::dec << dendl;
2127+ dout (10 ) << " Created dirfrag: " << ino << dendl;
21312128 *created = true ;
21322129 }
21332130 } else if (r < 0 ) {
2134- derr << " Unexpected error reading dirfrag 0x" << std::hex
2135- << ino << std::dec << " : " << cpp_strerror (r) << dendl;
2131+ derr << " Unexpected error reading dirfrag " << ino << " : " << cpp_strerror (r) << dendl;
21362132 return r;
21372133 } else {
2138- dout (20 ) << " Dirfrag already exists: 0x" << std::hex
2139- << ino << " " << fragment << std::dec << dendl;
2134+ dout (20 ) << " Dirfrag already exists: " << ino << " ." << fragment << dendl;
21402135 }
21412136
21422137 return 0 ;
@@ -2162,14 +2157,10 @@ int MetadataDriver::inject_linkage(
21622157 vals[key] = dentry_bl;
21632158 int r = metadata_io.omap_set (frag_oid.name , vals);
21642159 if (r != 0 ) {
2165- derr << " Error writing dentry 0x" << std::hex
2166- << dir_ino << std::dec << " /"
2167- << dname << " : " << cpp_strerror (r) << dendl;
2160+ derr << " Error writing dentry " << dir_ino << " /" << dname << " : " << cpp_strerror (r) << dendl;
21682161 return r;
21692162 } else {
2170- dout (20 ) << " Injected dentry 0x" << std::hex
2171- << dir_ino << " /" << dname << " pointing to 0x"
2172- << inode.inode ->ino << std::dec << dendl;
2163+ dout (20 ) << " Injected dentry " << dir_ino << " /" << dname << " pointing to " << inode.inode ->ino << dendl;
21732164 return 0 ;
21742165 }
21752166}
0 commit comments