Merged branch 'peter' with the tip. Pre-merge tag is 't_20020302_networking'.

[fs/lustre-release.git] / lustre / lib / page.c

diff --git a/lustre/lib/page.c b/lustre/lib/page.c
index 8d11b58..50b559b 100644 (file)
--- a/lustre/lib/page.c
+++ b/lustre/lib/page.c
@@ -43,6 +43,7 @@
 #define DEBUG_SUBSYSTEM S_OST
 
 #include <linux/obd_support.h>
+#include <linux/obd_class.h>
 #include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
 #include <linux/lustre_mds.h>
@@ -106,7 +107,7 @@ fail:
        return ERR_PTR(-EIO);
 }
 
-void lustre_prepare_page(unsigned from, unsigned to, struct page *page)
+int lustre_prepare_page(unsigned from, unsigned to, struct page *page)
 {
        int err;
 
@@ -115,9 +116,8 @@ void lustre_prepare_page(unsigned from, unsigned to, struct page *page)
        if (err) { 
                 CERROR("page index %ld from %d to %d err %d\n", 
                                 page->index, from, to, err); 
-               BUG();
         }
-
+        return err;
 }
 
 int lustre_commit_page(struct page *page, unsigned from, unsigned to)