From e85f5dcf129822ac0016ffba952dd3206a87f698 Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 23 May 2003 07:03:13 +0000 Subject: [PATCH] Merge b_devel -> b_orphan. DEVEL_ORPHAN_UPDATE_PARENT_20030522 -> DEVEL_ORPHAN_UPDATE_PARENT_20030522 --- lustre/mds/mds_internal.h | 4 ++-- lustre/tests/recovery-small-upcall.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100755 lustre/tests/recovery-small-upcall.sh diff --git a/lustre/mds/mds_internal.h b/lustre/mds/mds_internal.h index 5aa5443..4f69bbd 100644 --- 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 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: $@ -- 1.8.3.1