Merge tag 'ceph-for-6.7-rc1' of https://github.com/ceph/ceph-client

[sfrench/cifs-2.6.git] / fs / ceph / mds_client.c

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index b97a16df7580355472cbcc0b8c9cd7aaac84cad7..d95eb525519a644148af693ba68972c84b2ba941 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2928,6 +2928,8 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
        int ret;
        bool legacy = !(session->s_con.peer_features & CEPH_FEATURE_FS_BTIME);
        u16 request_head_version = mds_supported_head_version(session);
+       kuid_t caller_fsuid = req->r_cred->fsuid;
+       kgid_t caller_fsgid = req->r_cred->fsgid;
 
        ret = set_request_path_attr(mdsc, req->r_inode, req->r_dentry,
                              req->r_parent, req->r_path1, req->r_ino1.ino,
@@ -3025,12 +3027,24 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
            !test_bit(CEPHFS_FEATURE_HAS_OWNER_UIDGID, &session->s_features)) {
                WARN_ON_ONCE(!IS_CEPH_MDS_OP_NEWINODE(req->r_op));
 
-               pr_err_ratelimited_client(cl,
-                       "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID"
-                       " is not supported by MDS. Fail request with -EIO.\n");
+               if (enable_unsafe_idmap) {
+                       pr_warn_once_client(cl,
+                               "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID"
+                               " is not supported by MDS. UID/GID-based restrictions may"
+                               " not work properly.\n");
 
-               ret = -EIO;
-               goto out_err;
+                       caller_fsuid = from_vfsuid(req->r_mnt_idmap, &init_user_ns,
+                                                  VFSUIDT_INIT(req->r_cred->fsuid));
+                       caller_fsgid = from_vfsgid(req->r_mnt_idmap, &init_user_ns,
+                                                  VFSGIDT_INIT(req->r_cred->fsgid));
+               } else {
+                       pr_err_ratelimited_client(cl,
+                               "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID"
+                               " is not supported by MDS. Fail request with -EIO.\n");
+
+                       ret = -EIO;
+                       goto out_err;
+               }
        }
 
        /*
@@ -3082,9 +3096,9 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
        lhead->mdsmap_epoch = cpu_to_le32(mdsc->mdsmap->m_epoch);
        lhead->op = cpu_to_le32(req->r_op);
        lhead->caller_uid = cpu_to_le32(from_kuid(&init_user_ns,
-                                                 req->r_cred->fsuid));
+                                                 caller_fsuid));
        lhead->caller_gid = cpu_to_le32(from_kgid(&init_user_ns,
-                                                 req->r_cred->fsgid));
+                                                 caller_fsgid));
        lhead->ino = cpu_to_le64(req->r_deleg_ino);
        lhead->args = req->r_args;
 
@@ -4464,12 +4478,16 @@ static int reconnect_caps_cb(struct inode *inode, int mds, void *arg)
                rec.v2.flock_len = (__force __le32)
                        ((ci->i_ceph_flags & CEPH_I_ERROR_FILELOCK) ? 0 : 1);
        } else {
+               struct timespec64 ts;
+
                rec.v1.cap_id = cpu_to_le64(cap->cap_id);
                rec.v1.wanted = cpu_to_le32(__ceph_caps_wanted(ci));
                rec.v1.issued = cpu_to_le32(cap->issued);
                rec.v1.size = cpu_to_le64(i_size_read(inode));
-               ceph_encode_timespec64(&rec.v1.mtime, &inode->i_mtime);
-               ceph_encode_timespec64(&rec.v1.atime, &inode->i_atime);
+               ts = inode_get_mtime(inode);
+               ceph_encode_timespec64(&rec.v1.mtime, &ts);
+               ts = inode_get_atime(inode);
+               ceph_encode_timespec64(&rec.v1.atime, &ts);
                rec.v1.snaprealm = cpu_to_le64(ci->i_snap_realm->ino);
                rec.v1.pathbase = cpu_to_le64(pathbase);
        }