- ext2_obd.c --- fix the bugs in read/write for Linux 2.4.3

[fs/lustre-release.git] / lustre / obdclass / genops.c

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index f73dc27..a261dd8 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -1,5 +1,9 @@
 /*
  *  linux/fs/ext2_obd/sim_obd.c
 /*
  *  linux/fs/ext2_obd/sim_obd.c

+ * Copyright (C) 2001  Cluster File Systems, Inc.
+ *
+ * This code is issued under the GNU General Public License.
+ * See the file COPYING in this distribution

  *
  * These are the only exported functions; they provide the simulated object-
  * oriented disk.
  *
  * These are the only exported functions; they provide the simulated object-
  * oriented disk.


@@ -59,7 +63,7 @@ void obd_cleanup_obdo_cache(void)
 
 
 /* map connection to client */
 
 
 /* map connection to client */

-struct obd_client *gen_client(struct obd_conn *conn)
+struct obd_client *gen_client(const struct obd_conn *conn)

 {
         struct obd_device * obddev = conn->oc_dev;
         struct list_head * lh, * next;
 {
         struct obd_device * obddev = conn->oc_dev;
         struct list_head * lh, * next;


@@ -301,7 +305,7 @@ int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst,
         dst->o_size = src->o_size;
         dst->o_blocks = src->o_blocks;
         dst->o_valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS);
         dst->o_size = src->o_size;
         dst->o_blocks = src->o_blocks;
         dst->o_valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS);

-        UnlockPage(page);
+        obd_unlock_page(page);

         __free_page(page);
 
         EXIT;
         __free_page(page);
 
         EXIT;