Merge tag 'f2fs-for-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[tomoyo/tomoyo-test1.git] / fs / f2fs / verity.c

diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c
index 3f4f329..4fc95f3 100644 (file)
--- a/fs/f2fs/verity.c
+++ b/fs/f2fs/verity.c
@@ -276,11 +276,11 @@ static struct page *f2fs_read_merkle_tree_page(struct inode *inode,
 }
 
 static int f2fs_write_merkle_tree_block(struct inode *inode, const void *buf,
-                                       u64 index, int log_blocksize)
+                                       u64 pos, unsigned int size)
 {
-       loff_t pos = f2fs_verity_metadata_pos(inode) + (index << log_blocksize);
+       pos += f2fs_verity_metadata_pos(inode);
 
-       return pagecache_write(inode, buf, 1 << log_blocksize, pos);
+       return pagecache_write(inode, buf, size, pos);
 }
 
 const struct fsverity_operations f2fs_verityops = {