← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/include/rados.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/include/rados.h
12
12
 * osdmap encoding versions
13
13
 */
14
14
#define CEPH_OSDMAP_INC_VERSION     5
15
 
#define CEPH_OSDMAP_INC_VERSION_EXT 5
 
15
#define CEPH_OSDMAP_INC_VERSION_EXT 6
16
16
#define CEPH_OSDMAP_VERSION         5
17
 
#define CEPH_OSDMAP_VERSION_EXT     5
 
17
#define CEPH_OSDMAP_VERSION_EXT     6
18
18
 
19
19
/*
20
20
 * fs id
181
181
        /* read */
182
182
        CEPH_OSD_OP_READ      = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 1,
183
183
        CEPH_OSD_OP_STAT      = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 2,
 
184
        CEPH_OSD_OP_MAPEXT    = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 3,
184
185
 
185
186
        /* fancy read */
186
 
        CEPH_OSD_OP_MASKTRUNC = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 4,
 
187
        CEPH_OSD_OP_MASKTRUNC   = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 4,
 
188
        CEPH_OSD_OP_SPARSE_READ = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 5,
187
189
 
188
190
        /* write */
189
191
        CEPH_OSD_OP_WRITE     = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 1,
218
220
        CEPH_OSD_OP_RMXATTR   = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_ATTR | 4,
219
221
 
220
222
        /** subop **/
221
 
        CEPH_OSD_OP_PULL           = CEPH_OSD_OP_MODE_SUB | 1,
222
 
        CEPH_OSD_OP_PUSH           = CEPH_OSD_OP_MODE_SUB | 2,
223
 
        CEPH_OSD_OP_BALANCEREADS   = CEPH_OSD_OP_MODE_SUB | 3,
224
 
        CEPH_OSD_OP_UNBALANCEREADS = CEPH_OSD_OP_MODE_SUB | 4,
225
 
        CEPH_OSD_OP_SCRUB          = CEPH_OSD_OP_MODE_SUB | 5,
 
223
        CEPH_OSD_OP_PULL            = CEPH_OSD_OP_MODE_SUB | 1,
 
224
        CEPH_OSD_OP_PUSH            = CEPH_OSD_OP_MODE_SUB | 2,
 
225
        CEPH_OSD_OP_BALANCEREADS    = CEPH_OSD_OP_MODE_SUB | 3,
 
226
        CEPH_OSD_OP_UNBALANCEREADS  = CEPH_OSD_OP_MODE_SUB | 4,
 
227
        CEPH_OSD_OP_SCRUB           = CEPH_OSD_OP_MODE_SUB | 5,
 
228
        CEPH_OSD_OP_SCRUB_RESERVE   = CEPH_OSD_OP_MODE_SUB | 6,
 
229
        CEPH_OSD_OP_SCRUB_UNRESERVE = CEPH_OSD_OP_MODE_SUB | 7,
 
230
        CEPH_OSD_OP_SCRUB_STOP      = CEPH_OSD_OP_MODE_SUB | 8,
226
231
 
227
232
        /** lock **/
228
233
        CEPH_OSD_OP_WRLOCK    = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_LOCK | 1,