summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2013-12-27 12:21:49 +0900
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2014-01-06 16:42:19 +0900
commit26f466f4a948ddc765f9b474ad6e0bdb94fb1a66 (patch)
treec5decc32c0b02f6cf081518c182e1ed3ef5705fb
parent8230a0a49fc3f587644b284e51ac092607aa74bf (diff)
downloadlinux-stable-26f466f4a948ddc765f9b474ad6e0bdb94fb1a66.tar.gz
linux-stable-26f466f4a948ddc765f9b474ad6e0bdb94fb1a66.tar.bz2
linux-stable-26f466f4a948ddc765f9b474ad6e0bdb94fb1a66.zip
f2fs: call f2fs_put_page at the error case
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>
-rw-r--r--fs/f2fs/data.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index bf39eed2442f..253e6633dbf6 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -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);