git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[sfrench/cifs-2.6.git]
/
fs
/
ubifs
/
file.c
diff --git
a/fs/ubifs/file.c
b/fs/ubifs/file.c
index f90a466ea5db30bc1fcc05a3999d11eb2898727c..a02aa59d1e245124dcead693b15cd128fa2b1f4e 100644
(file)
--- a/
fs/ubifs/file.c
+++ b/
fs/ubifs/file.c
@@
-1490,7
+1490,10
@@
static int ubifs_migrate_page(struct address_space *mapping,
SetPagePrivate(newpage);
}
- migrate_page_copy(newpage, page);
+ if (mode != MIGRATE_SYNC_NO_COPY)
+ migrate_page_copy(newpage, page);
+ else
+ migrate_page_states(newpage, page);
return MIGRATEPAGE_SUCCESS;
}
#endif