summaryrefslogtreecommitdiff
path: root/fs/ceph/rados.h
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@hq.newdream.net>2010-02-02 03:10:45 +0300
committerSage Weil <sage@newdream.net>2010-02-03 03:29:50 +0300
commit0c948992a00d478c17042f4790b7d6b35299cf94 (patch)
tree8a6bdfabcaf9f524fcfa6ce2ec10ebb73df0a9aa /fs/ceph/rados.h
parent0f26c4b21b684825a6dd41f2bc04d48ff62d72f8 (diff)
downloadlinux-0c948992a00d478c17042f4790b7d6b35299cf94.tar.xz
ceph: always send truncation info with read and write osd ops
This fixes a bug where the read/write ops arrive the osd after a following truncation request. Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/rados.h')
-rw-r--r--fs/ceph/rados.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ceph/rados.h b/fs/ceph/rados.h
index c5614d4ae34a..123fd845459e 100644
--- a/fs/ceph/rados.h
+++ b/fs/ceph/rados.h
@@ -304,16 +304,14 @@ struct ceph_osd_op {
union {
struct {
__le64 offset, length;
+ __le64 truncate_size;
+ __le32 truncate_seq;
} __attribute__ ((packed)) extent;
struct {
__le32 name_len;
__le32 value_len;
} __attribute__ ((packed)) xattr;
struct {
- __le64 truncate_size;
- __le32 truncate_seq;
- } __attribute__ ((packed)) trunc;
- struct {
__u8 class_len;
__u8 method_len;
__u8 argc;