merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / kernel_patches / patches / export-truncate-2.5.63.patch

diff --git a/lustre/kernel_patches/patches/export-truncate-2.5.63.patch b/lustre/kernel_patches/patches/export-truncate-2.5.63.patch
index 3d82572..3063be4 100644 (file)
--- a/lustre/kernel_patches/patches/export-truncate-2.5.63.patch
+++ b/lustre/kernel_patches/patches/export-truncate-2.5.63.patch
@@ -9,7 +9,7 @@
                return 0;
  }
 +/* truncate.c */
-+extern void truncate_complete_page(struct page *);
++extern void truncate_complete_page(struct address_space *mapping,struct page *);
  
  /* filemap.c */
  extern unsigned long page_unuse(struct page *);