ceph: always send truncation info with read and write osd ops

[net-next-2.6.git] / fs / ceph / rados.h

diff --git a/fs/ceph/rados.h b/fs/ceph/rados.h
index c5614d4ae34a6864d780e999d1e8214eef06287d..123fd845459ee4842b3a6871cd26fdca604bdaf2 100644 (file)
--- a/fs/ceph/rados.h
+++ b/fs/ceph/rados.h
@@ -304,15 +304,13 @@ 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;