b=3704

r=nic

- landing b_confobd.
  Uses new libsysio version: https://wiki.clusterfs.com/lustre/LustreHowto?action=AttachFile&do=get&target=libsysio-head.0809.tgz

diff --git a/lustre/lvfs/Makefile.mk b/lustre/lvfs/Makefile.mk
index bc1e6b2..7124ea4 100644 (file)
--- a/lustre/lvfs/Makefile.mk
+++ b/lustre/lvfs/Makefile.mk
@@ -2,4 +2,4 @@ include $(src)/../portals/Kernelenv
 
 obj-y += lvfs.o fsfilt_ext3.o fsfilt_smfs.o
 lvfs-objs := fsfilt.o lvfs_common.o llog_lvfs.o lvfs_linux.o 
-lvfs-objs += llog.o llog_cat.o lvfs_reint.o lvfs_undo.o
+lvfs-objs += llog.o llog_cat.o 

diff --git a/lustre/lvfs/lvfs_internal.h b/lustre/lvfs/lvfs_internal.h
index 15382a1..c576b78 100644 (file)
--- a/lustre/lvfs/lvfs_internal.h
+++ b/lustre/lvfs/lvfs_internal.h
@@ -10,5 +10,8 @@ void fsfilt_ldiskfs_exit(void);
 int  fsfilt_reiser_init(void);
 void fsfilt_reiser_exit(void);
 
+void lvfs_mount_list_init(void);
+void lvfs_mount_list_cleanup(void);
+
 int lookup_by_path(char *path, int flags, struct nameidata *nd);
-struct dentry *lookup_create(struct nameidata *nd, int is_dir);
+

diff --git a/lustre/obdclass/Makefile.mk b/lustre/obdclass/Makefile.mk
index f01b998..af70c30 100644 (file)
--- a/lustre/obdclass/Makefile.mk
+++ b/lustre/obdclass/Makefile.mk
@@ -5,11 +5,12 @@
 
 include $(src)/../portals/Kernelenv
 
-obj-y += obdclass.o
+obj-y += obdclass.o confobd.o
 obdclass-objs := class_obd.o debug.o \
                genops.o sysctl.o uuid.o lprocfs_status.o lustre_handles.o \
                lustre_peer.o statfs_pack.o obdo.o llog_obd.o \
                obd_config.o llog_ioctl.o
+confobd-objs := conf_obd.o
 
 $(obj)/class_obd.o: lustre_build_version