- bring b_io up to b_devel

diff --git a/lustre/extN/extN-san.diff b/lustre/extN/extN-san.diff
index c961c3f..4d0f277 100644 (file)
--- a/lustre/extN/extN-san.diff
+++ b/lustre/extN/extN-san.diff
@@ -49,7 +49,7 @@
 +      handle_t *handle;
 +      struct buffer_head bh_tmp;
 +      int needed_blocks;
-+      int i, ret, ret2;
++      int i, ret = 0, ret2;
 +
 +      needed_blocks = extN_san_write_trans_blocks(nblocks);
 +

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index a27abb9..145d199 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -143,9 +143,11 @@ extern int init_obdclass(void);
 extern int ptlrpc_init(void);
 extern int ldlm_init(void);
 extern int osc_init(void);
+extern int lov_init(void);
 extern int echo_client_init(void);
 
 
+
 /* general stuff */
 #define jiffies 0