aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-12 19:38:35 -0400
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-28 02:03:00 -0400
commit650495dedc34daf8590c708a5b48f82ed2787b75 (patch)
treea0500f2ff48558419d3bec3a81c981ab9cb778a3 /fs/f2fs
parent65e5cd0a151d53d3d79ef4d81783d1dbc01d4b61 (diff)
f2fs: fix the inconsistent state of data pages
In get_lock_data_page, if there is a data race between get_dnode_of_data for node and grab_cache_page for data, f2fs is able to face with the following BUG_ON(dn.data_blkaddr == NEW_ADDR). kernel BUG at /home/zeus/f2fs_test/src/fs/f2fs/data.c:251! [<ffffffffa044966c>] get_lock_data_page+0x1ec/0x210 [f2fs] Call Trace: [<ffffffffa043b089>] f2fs_readdir+0x89/0x210 [f2fs] [<ffffffff811a0920>] ? fillonedir+0x100/0x100 [<ffffffff811a0920>] ? fillonedir+0x100/0x100 [<ffffffff811a07f8>] vfs_readdir+0xb8/0xe0 [<ffffffff811a0b4f>] sys_getdents+0x8f/0x110 [<ffffffff816d7999>] system_call_fastpath+0x16/0x1b This bug is able to be occurred when the block address of the data block is changed after f2fs_put_dnode(). In order to avoid that, this patch fixes the lock order of node and data blocks in which the node block lock is covered by the data block lock. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/data.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 91ff93b0b0f4..05fb5c6077b8 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -233,18 +233,23 @@ struct page *get_lock_data_page(struct inode *inode, pgoff_t index)
233 struct page *page; 233 struct page *page;
234 int err; 234 int err;
235 235
236repeat:
237 page = grab_cache_page(mapping, index);
238 if (!page)
239 return ERR_PTR(-ENOMEM);
240
236 set_new_dnode(&dn, inode, NULL, NULL, 0); 241 set_new_dnode(&dn, inode, NULL, NULL, 0);
237 err = get_dnode_of_data(&dn, index, LOOKUP_NODE); 242 err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
238 if (err) 243 if (err) {
244 f2fs_put_page(page, 1);
239 return ERR_PTR(err); 245 return ERR_PTR(err);
246 }
240 f2fs_put_dnode(&dn); 247 f2fs_put_dnode(&dn);
241 248
242 if (dn.data_blkaddr == NULL_ADDR) 249 if (dn.data_blkaddr == NULL_ADDR) {
250 f2fs_put_page(page, 1);
243 return ERR_PTR(-ENOENT); 251 return ERR_PTR(-ENOENT);
244repeat: 252 }
245 page = grab_cache_page(mapping, index);
246 if (!page)
247 return ERR_PTR(-ENOMEM);
248 253
249 if (PageUptodate(page)) 254 if (PageUptodate(page))
250 return page; 255 return page;