summaryrefslogtreecommitdiffstats
path: root/fs/ceph/rados.h
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
committerJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
commitf9221fd80343285514568da6c5dbda0f87109de8 (patch)
tree3a2f0077ebea9d094bdeedb319c97cb591d51c51 /fs/ceph/rados.h
parentocfs2_dlmfs: Fix math error when reading LVB. (diff)
parentocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff)
downloadlinux-f9221fd80343285514568da6c5dbda0f87109de8.tar.xz
linux-f9221fd80343285514568da6c5dbda0f87109de8.zip
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'fs/ceph/rados.h')
-rw-r--r--fs/ceph/rados.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ceph/rados.h b/fs/ceph/rados.h
index 26ac8b89a676..a1fc1d017b58 100644
--- a/fs/ceph/rados.h
+++ b/fs/ceph/rados.h
@@ -11,8 +11,10 @@
/*
* osdmap encoding versions
*/
-#define CEPH_OSDMAP_INC_VERSION 4
-#define CEPH_OSDMAP_VERSION 4
+#define CEPH_OSDMAP_INC_VERSION 5
+#define CEPH_OSDMAP_INC_VERSION_EXT 5
+#define CEPH_OSDMAP_VERSION 5
+#define CEPH_OSDMAP_VERSION_EXT 5
/*
* fs id