From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Sat, 7 May 2016 15:52:57 +0000 (-0700)
Subject: f2fs: do not preallocate block unaligned to 4KB
X-Git-Tag: v4.7-rc1~84^2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0080c5076409d211fbe28d6f07966f7d39e58bad;p=karo-tx-linux.git

f2fs: do not preallocate block unaligned to 4KB

Previously f2fs_preallocate_blocks() tries to allocate unaligned blocks.
In f2fs_write_begin(), however, prepare_write_begin() does not skip its
allocation due to (len != 4KB).
So, it needs locking node page twice unexpectedly.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 96b035319889..369d953bd770 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -582,8 +582,8 @@ ssize_t f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from)
 	struct f2fs_map_blocks map;
 	ssize_t ret = 0;
 
-	map.m_lblk = F2FS_BYTES_TO_BLK(iocb->ki_pos);
-	map.m_len = F2FS_BLK_ALIGN(iov_iter_count(from));
+	map.m_lblk = F2FS_BLK_ALIGN(iocb->ki_pos);
+	map.m_len = F2FS_BYTES_TO_BLK(iov_iter_count(from));
 	map.m_next_pgofs = NULL;
 
 	if (f2fs_encrypted_inode(inode))