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 28f9d8b..50b559b 100644 (file)
--- a/lustre/lib/page.c
+++ b/lustre/lib/page.c
@@ -1,3 +1,25 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.sf.net/projects/lustre/
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -18,14 +40,15 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 
+#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>
 #include <linux/lustre_light.h>
 
-
-
 /*
  * Remove page from dirty list
  */
@@ -84,15 +107,17 @@ 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;
 
        lock_page(page);
        err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
-       if (err)
-               BUG();
-
+       if (err) { 
+                CERROR("page index %ld from %d to %d err %d\n", 
+                                page->index, from, to, err); 
+        }
+        return err;
 }
 
 int lustre_commit_page(struct page *page, unsigned from, unsigned to)