f2fs: call f2fs_put_page at the error case
authorJaegeuk Kim <jaegeuk.kim@samsung.com>
Fri, 27 Dec 2013 03:21:49 +0000 (12:21 +0900)
committerJaegeuk Kim <jaegeuk.kim@samsung.com>
Mon, 6 Jan 2014 07:42:19 +0000 (16:42 +0900)
In f2fs_write_begin(), if f2fs_conver_inline_data() returns an error like
-ENOSPC, f2fs should call f2fs_put_page().
Otherwise, it is remained as a locked page, resulting in the following bug.

[<ffffffff8114657e>] sleep_on_page+0xe/0x20
[<ffffffff81146567>] __lock_page+0x67/0x70
[<ffffffff81157d08>] truncate_inode_pages_range+0x368/0x5d0
[<ffffffff81157ff5>] truncate_inode_pages+0x15/0x20
[<ffffffff8115804b>] truncate_pagecache+0x4b/0x70
[<ffffffff81158082>] truncate_setsize+0x12/0x20
[<ffffffffa02a1842>] f2fs_setattr+0x72/0x270 [f2fs]
[<ffffffff811cdae3>] notify_change+0x213/0x400
[<ffffffff811ab376>] do_truncate+0x66/0xa0
[<ffffffff811ab541>] vfs_truncate+0x191/0x1b0
[<ffffffff811ab5bc>] do_sys_truncate+0x5c/0xa0
[<ffffffff811ab78e>] SyS_truncate+0xe/0x10
[<ffffffff81756052>] system_call_fastpath+0x16/0x1b
[<ffffffffffffffff>] 0xffffffffffffffff

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

index bf39eed2442fbd48a07775ba1ce476c2052d98f8..253e6633dbf6df9f18dc764f14712d431696425b 100644 (file)
@@ -916,8 +916,10 @@ repeat:
                        goto inline_data;
        } else if (f2fs_has_inline_data(inode)) {
                err = f2fs_convert_inline_data(inode, page, flags);
-               if (err)
+               if (err) {
+                       f2fs_put_page(page, 1);
                        return err;
+               }
        }
 
        f2fs_lock_op(sbi);