浏览代码

f2fs: fix bad prefetchw of NULL page

For f2fs_read_data_pages, the f2fs_mpage_readpages gets "page == NULL",
so that, the prefetchw(&page->flags) is operated on NULL.

Fixes: f1e8866016 ("f2fs: expose f2fs_mpage_readpages")
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Kinglong Mee 8 年之前
父节点
当前提交
a83d50bc16
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      fs/f2fs/data.c

+ 2 - 1
fs/f2fs/data.c

@@ -1151,9 +1151,10 @@ static int f2fs_mpage_readpages(struct address_space *mapping,
 
 
 	for (page_idx = 0; nr_pages; page_idx++, nr_pages--) {
 	for (page_idx = 0; nr_pages; page_idx++, nr_pages--) {
 
 
-		prefetchw(&page->flags);
 		if (pages) {
 		if (pages) {
 			page = list_last_entry(pages, struct page, lru);
 			page = list_last_entry(pages, struct page, lru);
+
+			prefetchw(&page->flags);
 			list_del(&page->lru);
 			list_del(&page->lru);
 			if (add_to_page_cache_lru(page, mapping,
 			if (add_to_page_cache_lru(page, mapping,
 						  page->index,
 						  page->index,