ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support

Add support for the format change of MClientReply/MclientCaps.
Also add code that denies access to inodes with pool_ns layouts.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

1 files changed, 24 insertions, 3 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index cdbf8cf3d52c..6fe0ad26a7df 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2753,7 +2753,8 @@ static void handle_cap_grant(struct ceph_mds_client *mdsc,
                              void *inline_data, int inline_len,
                              struct ceph_buffer *xattr_buf,
                              struct ceph_mds_session *session,
-                             struct ceph_cap *cap, int issued)
+                             struct ceph_cap *cap, int issued,
+                             u32 pool_ns_len)
         __releases(ci->i_ceph_lock)
         __releases(mdsc->snap_rwsem)
 {
@@ -2873,6 +2874,8 @@ static void handle_cap_grant(struct ceph_mds_client *mdsc,
         if (newcaps & (CEPH_CAP_ANY_FILE_RD | CEPH_CAP_ANY_FILE_WR)) {
                 /* file layout may have changed */
                 ci->i_layout = grant->layout;
+                ci->i_pool_ns_len = pool_ns_len;
+
                 /* size/truncate_seq? */
                 queue_trunc = ceph_fill_file_size(inode, issued,
                                         le32_to_cpu(grant->truncate_seq),
@@ -3411,6 +3414,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
         u32  inline_len = 0;
         void *snaptrace;
         size_t snaptrace_len;
+        u32 pool_ns_len = 0;
         void *p, *end;
 
         dout("handle_caps from mds%d\n", mds);
@@ -3463,6 +3467,21 @@ void ceph_handle_caps(struct ceph_mds_session *session,
                 p += inline_len;
         }
 
+        if (le16_to_cpu(msg->hdr.version) >= 8) {
+                u64 flush_tid;
+                u32 caller_uid, caller_gid;
+                u32 osd_epoch_barrier;
+                /* version >= 5 */
+                ceph_decode_32_safe(&p, end, osd_epoch_barrier, bad);
+                /* version >= 6 */
+                ceph_decode_64_safe(&p, end, flush_tid, bad);
+                /* version >= 7 */
+                ceph_decode_32_safe(&p, end, caller_uid, bad);
+                ceph_decode_32_safe(&p, end, caller_gid, bad);
+                /* version >= 8 */
+                ceph_decode_32_safe(&p, end, pool_ns_len, bad);
+        }
+
         /* lookup ino */
         inode = ceph_find_inode(sb, vino);
         ci = ceph_inode(inode);
@@ -3518,7 +3537,8 @@ void ceph_handle_caps(struct ceph_mds_session *session,
                                   &cap, &issued);
                 handle_cap_grant(mdsc, inode, h,
                                  inline_version, inline_data, inline_len,
-                                 msg->middle, session, cap, issued);
+                                 msg->middle, session, cap, issued,
+                                 pool_ns_len);
                 if (realm)
                         ceph_put_snap_realm(mdsc, realm);
                 goto done_unlocked;
@@ -3542,7 +3562,8 @@ void ceph_handle_caps(struct ceph_mds_session *session,
                 issued |= __ceph_caps_dirty(ci);
                 handle_cap_grant(mdsc, inode, h,
                                  inline_version, inline_data, inline_len,
-                                 msg->middle, session, cap, issued);
+                                 msg->middle, session, cap, issued,
+                                 pool_ns_len);
                 goto done_unlocked;
 
         case CEPH_CAP_OP_FLUSH_ACK: