diff options
| author | Jeff Layton <jlayton@kernel.org> | 2022-08-25 09:31:06 -0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2023-08-24 11:24:35 +0200 |
| commit | 16be62fc8a53482529201b4be6bbcd0de3a058cb (patch) | |
| tree | 08888b72ce3d9a13ae2a3f250fe3ead3a8a080e4 /fs/ceph/mds_client.c | |
| parent | 14e034a61c908d4479be1a7ee9fe5b8d3d1f09b8 (diff) | |
| download | linux-16be62fc8a53482529201b4be6bbcd0de3a058cb.tar.gz linux-16be62fc8a53482529201b4be6bbcd0de3a058cb.tar.bz2 linux-16be62fc8a53482529201b4be6bbcd0de3a058cb.zip | |
ceph: size handling in MClientRequest, cap updates and inode traces
For encrypted inodes, transmit a rounded-up size to the MDS as the
normal file size and send the real inode size in fscrypt_file field.
Also, fix up creates and truncates to also transmit fscrypt_file.
When we get an inode trace from the MDS, grab the fscrypt_file field if
the inode is encrypted, and use it to populate the i_size field instead
of the regular inode size field.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph/mds_client.c')
| -rw-r--r-- | fs/ceph/mds_client.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 7de22052ee22..c257d75c5757 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2832,7 +2832,12 @@ static void encode_mclientrequest_tail(void **p, } else { ceph_encode_32(p, 0); } - ceph_encode_32(p, 0); // fscrypt_file for now + if (test_bit(CEPH_MDS_R_FSCRYPT_FILE, &req->r_req_flags)) { + ceph_encode_32(p, sizeof(__le64)); + ceph_encode_64(p, req->r_fscrypt_file); + } else { + ceph_encode_32(p, 0); + } } /* @@ -2922,6 +2927,8 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, /* fscrypt_file */ len += sizeof(u32); + if (test_bit(CEPH_MDS_R_FSCRYPT_FILE, &req->r_req_flags)) + len += sizeof(__le64); msg = ceph_msg_new2(CEPH_MSG_CLIENT_REQUEST, len, 1, GFP_NOFS, false); if (!msg) { |