ceph: Fix incorrect flush end position calculation

[ Upstream commit f452a2204614fc10e2c3b85904c4bd300c2789dc ]

In ceph, in fill_fscrypt_truncate(), the end flush position is calculated
by:

                loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;

but that's using the block shift not the block size.

Fix this to use the block size instead.

Fixes: 5c64737d2536 ("ceph: add truncate size handling support for fscrypt")
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index db6977c15c282872ba43f0f7fe223e52ae5d5c02..f0befbeb6cb8339e05b778a989f33b3fa456d7c4 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -2319,7 +2319,7 @@ static int fill_fscrypt_truncate(struct inode *inode,
 
        /* Try to writeback the dirty pagecaches */
        if (issued & (CEPH_CAP_FILE_BUFFER)) {
-               loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;
+               loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SIZE - 1;
 
                ret = filemap_write_and_wait_range(inode->i_mapping,
                                                   orig_pos, lend);