aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2013-08-20 06:13:07 -0400
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-08-20 06:32:48 -0400
commitd59ff4df7b7ae39e6fb047db9e83cd899b5764f1 (patch)
tree53831b9f1791bc0b0cd64b35c2f10741b8abc213 /fs/f2fs
parent9890ff3f23ed78c63611f661006cd5ae38550f44 (diff)
f2fs: fix wrong BUG_ON condition
This patch removes a false-alaramed BUG_ON. The previous BUG_ON condition didn't cover the following true scenario. In f2fs_add_link, 1) get_new_data_page gives an uptodate page successfully, and then, 2) init_inode_metadata returns -ENOSPC. At this moment, a new clean data page is remained in the page cache, but its block address still indicates NEW_ADDR. After then, even if sync is called, this clean data page cannot be written to the disk due to the clean state. So this means that get_lock_data_page should make a new empty page when its block address is NEW_ADDR and its page is not uptodated. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/data.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index ea3cb29018e9..6b328de41728 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -259,8 +259,17 @@ repeat:
259 if (PageUptodate(page)) 259 if (PageUptodate(page))
260 return page; 260 return page;
261 261
262 BUG_ON(dn.data_blkaddr == NEW_ADDR); 262 /*
263 BUG_ON(dn.data_blkaddr == NULL_ADDR); 263 * A new dentry page is allocated but not able to be written, since its
264 * new inode page couldn't be allocated due to -ENOSPC.
265 * In such the case, its blkaddr can be remained as NEW_ADDR.
266 * see, f2fs_add_link -> get_new_data_page -> init_inode_metadata.
267 */
268 if (dn.data_blkaddr == NEW_ADDR) {
269 zero_user_segment(page, 0, PAGE_CACHE_SIZE);
270 SetPageUptodate(page);
271 return page;
272 }
264 273
265 err = f2fs_readpage(sbi, page, dn.data_blkaddr, READ_SYNC); 274 err = f2fs_readpage(sbi, page, dn.data_blkaddr, READ_SYNC);
266 if (err) 275 if (err)