f2fs: don't need to get f2fs_lock_op for the inline_data test
authorJaegeuk Kim <jaegeuk.kim@samsung.com>
Fri, 27 Dec 2013 02:01:54 +0000 (11:01 +0900)
committerJaegeuk Kim <jaegeuk.kim@samsung.com>
Fri, 27 Dec 2013 03:40:41 +0000 (12:40 +0900)
This patch locates checking the inline_data prior to calling f2fs_lock_op()
in truncate_blocks(), since getting the lock is unnecessary.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
fs/f2fs/file.c

index dd80e72..7ef2d6a 100644 (file)
@@ -261,14 +261,14 @@ static int truncate_blocks(struct inode *inode, u64 from)
 
        trace_f2fs_truncate_blocks_enter(inode, from);
 
+       if (f2fs_has_inline_data(inode))
+               goto done;
+
        free_from = (pgoff_t)
                        ((from + blocksize - 1) >> (sbi->log_blocksize));
 
        f2fs_lock_op(sbi);
 
-       if (f2fs_has_inline_data(inode))
-               goto done;
-
        set_new_dnode(&dn, inode, NULL, NULL, 0);
        err = get_dnode_of_data(&dn, free_from, LOOKUP_NODE);
        if (err) {
@@ -295,9 +295,8 @@ static int truncate_blocks(struct inode *inode, u64 from)
        f2fs_put_dnode(&dn);
 free_next:
        err = truncate_inode_blocks(inode, free_from);
-done:
        f2fs_unlock_op(sbi);
-
+done:
        /* lastly zero out the first data page */
        truncate_partial_data_page(inode, from);