diff options
| author |   Yehuda Sadeh <yehuda@hq.newdream.net> | 2010-02-01 16:10:45 -0800 |
|---|---|---|
| committer |   Sage Weil <sage@newdream.net> | 2010-02-02 16:29:50 -0800 |
| commit | 0c948992a00d478c17042f4790b7d6b35299cf94 (patch) | |
| tree | 8a6bdfabcaf9f524fcfa6ce2ec10ebb73df0a9aa /fs/ceph/rados.h | |
| parent | ceph: remove unreachable code (diff) | |
| download | linux-dev-0c948992a00d478c17042f4790b7d6b35299cf94.tar.xz linux-dev-0c948992a00d478c17042f4790b7d6b35299cf94.zip | |
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.h | 6 |
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; |