← Back to branch summary

~ubuntu-branches/ubuntu/precise/ceph/precise

« back to all changes in this revision

Viewing changes to src/messages/MDiscover.h

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum, Clint Byrum, Micah Gersten
  • Date: 2011-02-12 22:50:26 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110212225026-yyyw4tk0msgql3ul
Tags: 0.24.2-0ubuntu1
https://launchpad.net/bugs/658670
https://launchpad.net/bugs/684011
[ Clint Byrum <clint@ubuntu.com> ]
* New upstream release. (LP: #658670, LP: #684011)
* debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
* Removed .la files from libceph1-dev, libcrush1-dev and 
  librados1-dev (per Debian policy v3.9.1 10.2).
* debian/control: adding pkg-config as a build dependency
* debian/control: depend on libcrypto++-dev instead of libssl-dev
* debian/watch: added watch file

[ Micah Gersten <micahg@ubuntu.com> ]
* debian/control: add Homepage

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/messages/MDiscover.h
51
51
 
52
52
  MDiscover() { }
53
53
  MDiscover(inodeno_t base_ino_,
 
54
            frag_t base_frag_,
54
55
            snapid_t s,
55
 
            filepath& want_,
 
56
            filepath& want_path_,
 
57
            inodeno_t want_ino_,
56
58
            bool want_base_dir_ = true,
57
59
            bool discover_xlocks_ = false) :
58
60
    Message(MSG_MDS_DISCOVER),
59
61
    base_ino(base_ino_),
 
62
    base_dir_frag(base_frag_),
60
63
    snapid(s),
61
 
    want(want_),
62
 
    want_ino(0),
 
64
    want(want_path_),
 
65
    want_ino(want_ino_),
63
66
    want_base_dir(want_base_dir_),
64
67
    want_xlocked(discover_xlocks_) { }
65
 
  MDiscover(dirfrag_t base_dirfrag,
66
 
            snapid_t s,
67
 
            inodeno_t want_ino_,
68
 
            bool want_base_dir_ = true) :
69
 
    Message(MSG_MDS_DISCOVER),
70
 
    base_ino(base_dirfrag.ino),
71
 
    base_dir_frag(base_dirfrag.frag),
72
 
    snapid(s),
73
 
    want_ino(want_ino_),
74
 
    want_base_dir(want_base_dir_),
75
 
    want_xlocked(false) { }
76
68
private:
77
69
  ~MDiscover() {}
78
70
 
79
71
public:
80
72
  const char *get_type_name() { return "Dis"; }
81
73
  void print(ostream &out) {
82
 
    out << "discover(" << base_ino << "." << base_dir_frag
 
74
    out << "discover(" << header.tid << " " << base_ino << "." << base_dir_frag
83
75
        << " " << want;
84
 
    if (want_ino) out << want_ino;
 
76
    if (want_ino)
 
77
      out << want_ino;
85
78
    out << ")";
86
79
  }
87
80