Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e27dae4d authored by Dan Carpenter's avatar Dan Carpenter Committed by Jaegeuk Kim
Browse files

f2fs: alloc_page() doesn't return an ERR_PTR 



alloc_page() returns a NULL on failure, it never returns an ERR_PTR.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 479bd73a

fs/f2fs/node.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1517,8 +1517,8 @@ int restore_node_summary(struct f2fs_sb_info *sbi, 




	/* alloc temporal page for read node */

	/* alloc temporal page for read node */

	page = alloc_page(GFP_NOFS | __GFP_ZERO);

	page = alloc_page(GFP_NOFS | __GFP_ZERO);

	if (IS_ERR(page))

	if (!page)

		return PTR_ERR(page);

		return -ENOMEM;

	lock_page(page);

	lock_page(page);





	/* scan the node segment */

	/* scan the node segment */

fs/f2fs/recovery.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -129,8 +129,8 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) 




	/* read node page */

	/* read node page */

	page = alloc_page(GFP_F2FS_ZERO);

	page = alloc_page(GFP_F2FS_ZERO);

	if (IS_ERR(page))

	if (!page)

		return PTR_ERR(page);

		return -ENOMEM;

	lock_page(page);

	lock_page(page);





	while (1) {

	while (1) {
@@ -367,7 +367,7 @@ static int recover_data(struct f2fs_sb_info *sbi, 




	/* read node page */

	/* read node page */

	page = alloc_page(GFP_NOFS | __GFP_ZERO);

	page = alloc_page(GFP_NOFS | __GFP_ZERO);

	if (IS_ERR(page))

	if (!page)

		return -ENOMEM;

		return -ENOMEM;





	lock_page(page);

	lock_page(page);