- minor changes to run luster on 2.6

diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
index b5a022d..e20ce4a 100644 (file)
--- a/lustre/lov/lov_log.c
+++ b/lustre/lov/lov_log.c
@@ -74,7 +74,7 @@ int lov_llog_setup(struct obd_device *obd, struct obd_device *disk_obd,
 int lov_llog_cleanup(struct obd_device *obd)
 {
         struct lov_obd *lov = &obd->u.lov;
-        int i, rc;
+        int i, rc = 0;
 
         ENTRY;
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {

diff --git a/lustre/mds/Makefile.mk b/lustre/mds/Makefile.mk
index 9e9261f..495bb0d 100644 (file)
--- a/lustre/mds/Makefile.mk
+++ b/lustre/mds/Makefile.mk
@@ -7,5 +7,5 @@ include $(src)/../portals/Kernelenv
 
 obj-y += mds.o
 mds-objs := mds_lov.o handler.o mds_reint.o mds_fs.o lproc_mds.o mds_open.o \
-               mds_lib.o mds_unlink_open.o
+               mds_lib.o mds_unlink_open.o mds_log.o