Branch b_hd_kdmu

Minor compilation fixes.

diff --git a/lustre/dmu-osd/osd_handler.c b/lustre/dmu-osd/osd_handler.c
index 201edda..731a25d 100644 (file)
--- a/lustre/dmu-osd/osd_handler.c
+++ b/lustre/dmu-osd/osd_handler.c
@@ -1786,9 +1786,9 @@ static void osd_object_ref_del(const struct lu_env *env,
                 LASSERT(oh->ot_tx != NULL);
                 tx = oh->ot_tx;
         }
-        spin_lock(&obj->oo_guard);
+        down(&obj->oo_guard);
         udmu_object_links_dec(obj->oo_db, tx);
-        spin_unlock(&obj->oo_guard);
+        up(&obj->oo_guard);
 }
 
 int osd_xattr_get(const struct lu_env *env, struct dt_object *dt,

diff --git a/lustre/osd/Makefile.in b/lustre/osd/Makefile.in
index 6769f8a..0f6dc11 100644 (file)
--- a/lustre/osd/Makefile.in
+++ b/lustre/osd/Makefile.in
@@ -1,5 +1,5 @@
 MODULES := osd
-osd-objs := osd_handler.o osd_oi.o osd_igif.o osd_lproc.o osd_io.o osd_compat.o
+osd-objs := osd_handler.o osd_oi.o osd_igif.o osd_lproc.o osd_io.o
 
 EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
 

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index ad6dbe5..ef9499c 100644 (file)
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -780,7 +780,7 @@ out:
  */
 static int osd_trans_stop(const struct lu_env *env, struct thandle *th)
 {
-        int                     result;
+        int                     result = 0;
         struct osd_thandle     *oh;
         struct osd_thread_info *oti = osd_oti_get(env);
         struct filter_iobuf    *iobuf = &oti->oti_iobuf;