From a928a0acec0275ff807cc76a42ebc04cec5e6c8a Mon Sep 17 00:00:00 2001
From: meijia <meijia>
Date: Mon, 19 May 2003 17:04:23 +0000
Subject: [PATCH] merge b_devel into b_eq:   DEVEL_EQ_UPDATE_PARENT_20030519 ->
 DEVEL_EQ_UPDATE_CHILD_20030519

only resolve confliction.
---
 lustre/liblustre/liblustre.c | 83 --------------------------------------------
 lustre/liblustre/lustrerun   | 12 -------
 lustre/liblustre/sharelib.sh | 47 -------------------------
 3 files changed, 142 deletions(-)
 delete mode 100644 lustre/liblustre/liblustre.c
 delete mode 100755 lustre/liblustre/lustrerun
 delete mode 100755 lustre/liblustre/sharelib.sh

diff --git a/lustre/liblustre/liblustre.c b/lustre/liblustre/liblustre.c
deleted file mode 100644
index 5b827b4..0000000
--- a/lustre/liblustre/liblustre.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/queue.h>
-#include <sys/statvfs.h>
-
-#include <sysio.h>
-#include <mount.h>
-
-#define ENV_LUSTRE_MNTPNT "LUSTRE_MOUNT_POINT"
-#define ENV_PORTALS_MYNID "PORTALS_MYNID"
-
-extern int lllib_init(char *arg);
-
-static char	*root_driver = "native";
-static char	*lustre_driver = "llite";
-static char	*root_path = "/";
-static char	*lustre_path = NULL;
-static char     *portals_mynid = NULL;
-static unsigned mntflgs = 0;
-
-extern int portal_debug;
-extern int portal_subsystem_debug;
-
-extern int _sysio_native_init();
-
-void __liblustre_setup_(void)
-{
-	int err;
-
-	lustre_path = getenv(ENV_LUSTRE_MNTPNT);
-	if (!lustre_path) {
-		printf("lislustre: env %s didn't set!\n", ENV_LUSTRE_MNTPNT);
-		exit(1);
-	}
-
-	portals_mynid = getenv("PORTALS_MYNID");
-	if (!portals_mynid) {
-		printf("lislustre: env %s didn't set!\n", ENV_PORTALS_MYNID);
-		exit(1);
-	}
-
-	if (_sysio_init() != 0) {
-		perror("init sysio");
-		exit(1);
-	}
-
-        _sysio_native_init();
-
-	err = _sysio_mount_root(root_path, root_driver, mntflgs, NULL);
-	if (err) {
-		perror(root_driver);
-		exit(1);
-	}
-
-#if 1
-	portal_debug = 0;
-	portal_subsystem_debug = 0;
-#endif
-	err = lllib_init(portals_mynid);
-	if (err) {
-		perror("init llite driver");
-		exit(1);
-	}	
-
-        err = mount("/", lustre_path, lustre_driver, mntflgs, NULL);
-	if (err) {
-		errno = -err;
-		perror(lustre_driver);
-		exit(1);
-	}
-}
-
-void __liblustre_cleanup_(void)
-{
-	_sysio_shutdown();
-}
diff --git a/lustre/liblustre/lustrerun b/lustre/liblustre/lustrerun
deleted file mode 100755
index f44fb925..0000000
--- a/lustre/liblustre/lustrerun
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-#PORTALS_MYNID=${PORTALS_MYNID:-`hostname -i`}
-PORTALS_MYNID=${PORTALS_MYNID:-"172.16.1.1"}
-LUSTRE_MOUNT_POINT=${LUSTRE_MOUNT_POINT:-"/mnt/lustre"}
-LD_PRELOAD=${LD_PRELOAD:-"/usr/lib/liblustre.so"}
-
-export PORTALS_MYNID
-export LUSTRE_MOUNT_POINT
-export LD_PRELOAD
-
-exec $@
diff --git a/lustre/liblustre/sharelib.sh b/lustre/liblustre/sharelib.sh
deleted file mode 100755
index cd205a4..0000000
--- a/lustre/liblustre/sharelib.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-AR=/usr/bin/ar
-LD=/usr/bin/ld
-
-CWD=`pwd`
-
-LUS=$CWD/../
-PTL=$LUS/../portals
-SYSIO=$LUS/../libsysio
-
-TMP=/tmp/llib_tmp
-
-LLLIBS="$LUS/liblustre/libllite.a \
-	$SYSIO/src/libsysio.a \
-	$SYSIO/dev/stdfd/libsysio_stdfd.a \
-	$SYSIO/drivers/native/libsysio_native.a \
-	$LUS/lov/liblov.a \
-	$LUS/osc/libosc.a \
-	$LUS/ldlm/libldlm.a \
-	$LUS/ptlrpc/libptlrpc.a \
-	$LUS/obdclass/liblustreclass.a \
-	$LUS/mdc/libmdc.a \
-        $PTL/user/procbridge/libprocbridge.a  \
-	$PTL/user/tcpnal/libtcpnal.a \
-        $PTL/user/util/libtcpnalutil.a \
-	$PTL/api/libptlapi.a \
-        $PTL/lib/libptllib.a \
-	$PTL/linux/utils/libptlctl.a"
-
-rm -rf $TMP
-mkdir -p $TMP
-
-i=0
-for lib in $LLLIBS; do
-	mkdir $TMP/$i
-	cd $TMP/$i
-	$AR xv $lib
-	i=$(($i+1))
-done
-
-cd $TMP
-
-$LD -shared -o $CWD/liblustre.so -init __liblustre_setup_ -fini __liblustre_cleanup_ \
-	`find . -type f` -lpthread -lreadline -lncurses 
-
-cd $CWD
-- 
1.8.3.1