summaryrefslogtreecommitdiff
path: root/fs/ceph/ceph_fs.h
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-05-13 02:21:32 +0400
committerSage Weil <sage@newdream.net>2010-08-03 02:48:50 +0400
commit20cb34ae9e4b008a8789a48d52f5aa279dc400b6 (patch)
tree03b0c011ebaec2cb26c81f122b5432119976dc6b /fs/ceph/ceph_fs.h
parentce1fbc8dd657a4bbcf26c683c9d07c88db83fd86 (diff)
downloadlinux-20cb34ae9e4b008a8789a48d52f5aa279dc400b6.tar.xz
ceph: support v2 reconnect encoding
Encode either old or v2 encoding of client_reconnect message, depending on whether the peer has the FLOCK feature bit. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/ceph_fs.h')
-rw-r--r--fs/ceph/ceph_fs.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/ceph/ceph_fs.h b/fs/ceph/ceph_fs.h
index 5bf4ec2cf9eb..bb17a18cc190 100644
--- a/fs/ceph/ceph_fs.h
+++ b/fs/ceph/ceph_fs.h
@@ -635,12 +635,21 @@ struct ceph_mds_cap_reconnect {
__le64 cap_id;
__le32 wanted;
__le32 issued;
+ __le64 snaprealm;
+ __le64 pathbase; /* base ino for our path to this ino */
+ __le32 flock_len; /* size of flock state blob, if any */
+} __attribute__ ((packed));
+/* followed by flock blob */
+
+struct ceph_mds_cap_reconnect_v1 {
+ __le64 cap_id;
+ __le32 wanted;
+ __le32 issued;
__le64 size;
struct ceph_timespec mtime, atime;
__le64 snaprealm;
__le64 pathbase; /* base ino for our path to this ino */
} __attribute__ ((packed));
-/* followed by encoded string */
struct ceph_mds_snaprealm_reconnect {
__le64 ino; /* snap realm base */