← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ceph/trusty-updates

« back to all changes in this revision

Viewing changes to src/rbd.cc

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-04-09 11:14:03 UTC
  • mfrom: (1.1.33)
  • Revision ID: package-import@ubuntu.com-20140409111403-jlql95pa8kg1nk9a
Tags: 0.79-0ubuntu1
https://launchpad.net/bugs/1278466
* New upstream release (LP: #1278466):
  - d/p/modules.patch: Refreshed.
  - d/ceph.install: Install all jerasure modules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/rbd.cc
511
511
      return r;
512
512
  }
513
513
 
 
514
  char prefix[RBD_MAX_BLOCK_NAME_SIZE + 1];
 
515
  strncpy(prefix, info.block_name_prefix, RBD_MAX_BLOCK_NAME_SIZE);
 
516
  prefix[RBD_MAX_BLOCK_NAME_SIZE] = '\0';
 
517
 
514
518
  if (f) {
515
519
    f->open_object_section("image");
516
520
    f->dump_string("name", imgname);
518
522
    f->dump_unsigned("objects", info.num_objs);
519
523
    f->dump_int("order", info.order);
520
524
    f->dump_unsigned("object_size", info.obj_size);
521
 
    f->dump_string("block_name_prefix", info.block_name_prefix);
 
525
    f->dump_string("block_name_prefix", prefix);
522
526
    f->dump_int("format", (old_format ? 1 : 2));
523
527
  } else {
524
528
    cout << "rbd image '" << imgname << "':\n"
528
532
         << "\torder " << info.order
529
533
         << " (" << prettybyte_t(info.obj_size) << " objects)"
530
534
         << std::endl
531
 
         << "\tblock_name_prefix: " << info.block_name_prefix
 
535
         << "\tblock_name_prefix: " << prefix
532
536
         << std::endl
533
537
         << "\tformat: " << (old_format ? "1" : "2")
534
538
         << std::endl;