Merge b_devel -> b_orphan.

  DEVEL_ORPHAN_UPDATE_PARENT_20030522 -> DEVEL_ORPHAN_UPDATE_PARENT_20030522

diff --git a/lustre/mds/mds_internal.h b/lustre/mds/mds_internal.h
index 5aa5443..4f69bbd 100644 (file)
--- a/lustre/mds/mds_internal.h
+++ b/lustre/mds/mds_internal.h
@@ -9,8 +9,8 @@ void mds_mfd_put(struct mds_file_data *mfd);
 void mds_mfd_destroy(struct mds_file_data *mfd);
 
 /* mds/mds_reint.c */
-void mds_last_rcvd_cb(struct obd_device *obd, __u64 last_rcvd,
-                      void *cb_data, int error);
+void mds_commit_cb(struct obd_device *obd, __u64 last_rcvd,
+                  void *cb_data, int error);
 int mds_finish_transno(struct mds_obd *mds, struct inode *inode, void *handle,
                        struct ptlrpc_request *req, int rc, __u32 op_data,
                        fsfilt_cb_t cb_fn, void *cb_data);

diff --git a/lustre/tests/recovery-small-upcall.sh b/lustre/tests/recovery-small-upcall.sh
new file mode 100755 (executable)
index 0000000..02e9f69
--- /dev/null
+++ b/lustre/tests/recovery-small-upcall.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+LUSTRE=`dirname $0`/..
+$LUSTRE/utils/lctl --device %$3 recover || logger -p kern.info recovery failed: $@