snap: base types

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 04b4eda42f495829f112cc6c84180868a3d2a1f2..0872e40223270ddd145d1bcd1eae584c455e5cef 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -53,13 +53,17 @@ static inline int ceph_fsid_equal(const struct ceph_fsid *a, const struct ceph_f
  */
 typedef __le64 ceph_ino_t;
 
+typedef __le64 ceph_snapid_t;
+#define CEPH_MAXSNAP 0xffffffffffffffull  /* 56 bits; see ceph_pg */
+#define CEPH_NOSNAP  ((__u64)(-1))
+
 struct ceph_object {
        union {
                __u8 raw[20];        /* fits a sha1 hash */
                struct {
                        __le64 ino;  /* inode "file" identifier */
                        __le32 bno;  /* "block" (object) in that "file" */
-                       __le64 rev;  /* revision.  normally ctime (as epoch). */
+                       __le64 snap; /* snapshot id.  usually NOSNAP. */
                } __attribute__ ((packed));
        };
 } __attribute__ ((packed));
@@ -159,17 +163,19 @@ struct ceph_file_layout {
  * placement group.
  * we encode this into one __le64.
  */
-#define CEPH_PG_TYPE_REP   1
-#define CEPH_PG_TYPE_RAID4 2
+#define CEPH_PG_TYPE_REP     1
+#define CEPH_PG_TYPE_RAID4   2
+#define CEPH_PG_TYPE_SNAP_LB 3
+#define CEPH_PG_TYPE_SNAP_UB 4
 union ceph_pg {
        __u64 pg64;
        struct {
                __s16 preferred; /* preferred primary osd */
                __u16 ps;        /* placement seed */
+               __u8 __pad;
+               __u8 size;
                __u8 pool;       /* implies crush ruleset */
                __u8 type;
-               __u8 size;
-               __u8 __pad;
        } pg;
 } __attribute__ ((packed));
 

diff --git a/src/include/types.h b/src/include/types.h
index 2186085872f9f0f3e88576d20359586b887d7f47..8e7b7d21d70fb20a0a1f614412b2e1854eff3196 100644 (file)
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -139,6 +139,12 @@ typedef __u32 epoch_t;       // map epoch  (32bits -> 13 epochs/second for 10 ye
 typedef __u64 coll_t;
 
 
+// snaps
+typedef __u64 snapid_t;
+#define MAXSNAP CEPH_MAXSNAP
+#define NOSNAP  CEPH_NOSNAP
+
+
 // --------------------------------------
 // inode