summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/inline.c
diff options
context:
space:
mode:
authorJaegeuk Kim2014-08-15 01:32:54 +0200
committerJaegeuk Kim2014-08-21 22:57:01 +0200
commit764aa3e978020121cbb86111b5d8f42830015a06 (patch)
treedf2e0f43245a452010aa184042e7da2306ed2e4b /fs/f2fs/inline.c
parentf2fs: prevent checkpoint during roll-forward (diff)
downloadkernel-qcow2-linux-764aa3e978020121cbb86111b5d8f42830015a06.tar.gz
kernel-qcow2-linux-764aa3e978020121cbb86111b5d8f42830015a06.tar.xz
kernel-qcow2-linux-764aa3e978020121cbb86111b5d8f42830015a06.zip
f2fs: avoid double lock in truncate_blocks
The init_inode_metadata calls truncate_blocks when error is occurred. The callers holds f2fs_lock_op, so we should not call it again in truncate_blocks. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/inline.c')
-rw-r--r--fs/f2fs/inline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 520758b91999..4d1f39f4583c 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -247,7 +247,7 @@ process_inline:
update_inode(inode, ipage);
f2fs_put_page(ipage, 1);
} else if (ri && (ri->i_inline & F2FS_INLINE_DATA)) {
- truncate_blocks(inode, 0);
+ truncate_blocks(inode, 0, false);
set_inode_flag(F2FS_I(inode), FI_INLINE_DATA);
goto process_inline;
}