diff options
| author | Xiubo Li <xiubli@redhat.com> | 2024-01-18 14:24:41 +0800 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2024-02-07 14:43:29 +0100 |
| commit | bbb20ea993f46743f7429092ddc52f1a5c5428ef (patch) | |
| tree | 934e9518d85b609784b626a8d04b186e9bd837d4 | |
| parent | 8e46a2d068c92a905d01cbb018b00d66991585ab (diff) | |
| download | linux-stable-bbb20ea993f46743f7429092ddc52f1a5c5428ef.tar.gz linux-stable-bbb20ea993f46743f7429092ddc52f1a5c5428ef.tar.bz2 linux-stable-bbb20ea993f46743f7429092ddc52f1a5c5428ef.zip | |
ceph: always set initial i_blkbits to CEPH_FSCRYPT_BLOCK_SHIFT
The fscrypt code will use i_blkbits to setup ci_data_unit_bits when
allocating the new inode, but ceph will initiate i_blkbits ater when
filling the inode, which is too late. Since ci_data_unit_bits will only
be used by the fscrypt framework so initiating i_blkbits with
CEPH_FSCRYPT_BLOCK_SHIFT is safe.
Link: https://tracker.ceph.com/issues/64035
Fixes: 5b1188847180 ("fscrypt: support crypto data unit size less than filesystem block size")
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
| -rw-r--r-- | fs/ceph/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 0c25d326afc4..7b2e77517f23 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -78,6 +78,8 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry, if (!inode) return ERR_PTR(-ENOMEM); + inode->i_blkbits = CEPH_FSCRYPT_BLOCK_SHIFT; + if (!S_ISLNK(*mode)) { err = ceph_pre_init_acls(dir, mode, as_ctx); if (err < 0) |