From: Johann Lombardi <johann@whamcloud.com>
Date: Tue, 28 Jun 2011 04:48:43 +0000 (+0200)
Subject: LU-130 disable page migration
X-Git-Tag: 1.8.6~2
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=cfaa163b5f52d3a89aecaf257581c35b67771887;p=fs%2Flustre-release.git

LU-130 disable page migration

Disable page migration until we implement a proper ->migratepage handler.

Change-Id: I04eb78c0d04c828eabb3598a3e42ebf51daec3c2
Signed-off-by: Johann Lombardi <johann@whamcloud.com>
---

diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index 589dfa9..f6a3da6 100644
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -408,6 +408,15 @@ static int ll_write_end(struct file *file, struct address_space *mapping,
 }
 #endif
 
+#ifdef CONFIG_MIGRATION
+int ll_migratepage(struct address_space *mapping,
+                   struct page *newpage, struct page *page)
+{
+        /* Always fail page migration until we have a proper implementation */
+        return -EIO;
+}
+#endif
+
 #ifndef MS_HAS_NEW_AOPS
 struct address_space_operations ll_aops = {
         .readpage       = ll_readpage,
@@ -426,6 +435,9 @@ struct address_space_operations ll_aops = {
 #endif
         .invalidatepage = ll_invalidatepage,
         .releasepage    = ll_releasepage,
+#ifdef CONFIG_MIGRATION
+        .migratepage    = ll_migratepage,
+#endif
         .bmap           = NULL
 };
 #else
@@ -442,6 +454,9 @@ struct address_space_operations_ext ll_aops = {
         .orig_aops.invalidatepage = ll_invalidatepage,
         .orig_aops.releasepage    = ll_releasepage,
         .orig_aops.bmap           = NULL,
+#ifdef CONFIG_MIGRATION
+        .orig_aops.migratepage    = ll_migratepage,
+#endif
         .write_begin    = ll_write_begin,
         .write_end      = ll_write_end
 };