Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

migration: fix writepage error

Browse source 
Page migration's writeout() has got understandably confused by the nasty
AOP_WRITEPAGE_ACTIVATE case: as in normal success, a writepage() error has
unlocked the page, so writeout() then needs to relock it.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Hugh Dickins 2008-11-19 15:36:36 -08:00 committed by Linus Torvalds
parent 966c8c12dc
commit bda8550dee
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mm/migrate.c
View file

@ -522,15 +522,12 @@ static int writeout(struct address_space *mapping, struct page *page)
remove_migration_ptes(page, page); remove_migration_ptes(page, page);
rc = mapping->a_ops->writepage(page, &wbc); rc = mapping->a_ops->writepage(page, &wbc);
if (rc < 0)
/* I/O Error writing */
return -EIO;
if (rc != AOP_WRITEPAGE_ACTIVATE) if (rc != AOP_WRITEPAGE_ACTIVATE)
/* unlocked. Relock */ /* unlocked. Relock */
lock_page(page); lock_page(page);
return -EAGAIN; return (rc < 0) ? -EIO : -EAGAIN;
} }
/* /*