ceph: update cap message struct version to 10

The userland ceph has MClientCaps at struct version 10. This brings the
kernel up the same version.

For now, all of the the new stuff is set to default values including
the flags field, which will be conditionally set in a later patch.

Note that we don't need to set the change_attr and btime to anything
since we aren't currently setting the feature flag. The MDS should
ignore those values.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 2bb183d764aeba90fc25d4bb9aa51e79553077c5..508663ed413c5ab85453e9c451a9b046935550cd 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1013,6 +1013,7 @@ static int send_cap_msg(struct cap_msg_args *arg)
        struct ceph_msg *msg;
        void *p;
        size_t extra_len;
+       struct timespec zerotime = {0};
 
        dout("send_cap_msg %s %llx %llx caps %s wanted %s dirty %s"
             " seq %u/%u tid %llu/%llu mseq %u follows %lld size %llu/%llu"
@@ -1026,13 +1027,13 @@ static int send_cap_msg(struct cap_msg_args *arg)
 
        /* flock buffer size + inline version + inline data size +
         * osd_epoch_barrier + oldest_flush_tid */
-       extra_len = 4 + 8 + 4 + 4 + 8;
+       extra_len = 4 + 8 + 4 + 4 + 8 + 4 + 4 + 4 + 8 + 8 + 4;
        msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPS, sizeof(*fc) + extra_len,
                           GFP_NOFS, false);
        if (!msg)
                return -ENOMEM;
 
-       msg->hdr.version = cpu_to_le16(6);
+       msg->hdr.version = cpu_to_le16(10);
        msg->hdr.tid = cpu_to_le64(arg->flush_tid);
 
        fc = msg->front.iov_base;
@@ -1068,17 +1069,43 @@ static int send_cap_msg(struct cap_msg_args *arg)
        }
 
        p = fc + 1;
-       /* flock buffer size */
+       /* flock buffer size (version 2) */
        ceph_encode_32(&p, 0);
-       /* inline version */
+       /* inline version (version 4) */
        ceph_encode_64(&p, arg->inline_data ? 0 : CEPH_INLINE_NONE);
        /* inline data size */
        ceph_encode_32(&p, 0);
-       /* osd_epoch_barrier */
+       /* osd_epoch_barrier (version 5) */
        ceph_encode_32(&p, 0);
-       /* oldest_flush_tid */
+       /* oldest_flush_tid (version 6) */
        ceph_encode_64(&p, arg->oldest_flush_tid);
 
+       /*
+        * caller_uid/caller_gid (version 7)
+        *
+        * Currently, we don't properly track which caller dirtied the caps
+        * last, and force a flush of them when there is a conflict. For now,
+        * just set this to 0:0, to emulate how the MDS has worked up to now.
+        */
+       ceph_encode_32(&p, 0);
+       ceph_encode_32(&p, 0);
+
+       /* pool namespace (version 8) (mds always ignores this) */
+       ceph_encode_32(&p, 0);
+
+       /*
+        * btime and change_attr (version 9)
+        *
+        * We just zero these out for now, as the MDS ignores them unless
+        * the requisite feature flags are set (which we don't do yet).
+        */
+       ceph_encode_timespec(p, &zerotime);
+       p += sizeof(struct ceph_timespec);
+       ceph_encode_64(&p, 0);
+
+       /* Advisory flags (version 10) */
+       ceph_encode_32(&p, 0);
+
        ceph_con_send(&arg->session->s_con, msg);
        return 0;
 }