From 8fc423ad5178e03bbb7a6afa8b711c73412b1e3b Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Tue, 21 Jul 2009 11:35:36 +0000
Subject: [PATCH] - merge issues fixed

---
 lustre/osd/Makefile.in     |  2 +-
 lustre/osd/autoMakefile.am |  4 ++--
 lustre/osd/osd_handler.c   | 16 ++--------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lustre/osd/Makefile.in b/lustre/osd/Makefile.in
index b622cab..a7358b7 100644
--- a/lustre/osd/Makefile.in
+++ b/lustre/osd/Makefile.in
@@ -1,5 +1,5 @@
 MODULES := osd-ldiskfs
-osd-ldiskfs-objs := osd_handler.o osd_oi.o osd_igif.o osd_lproc.o \
+osd-ldiskfs-objs := osd_handler.o osd_oi.o osd_igif.o osd_lproc.o osd_iam.o \
                     osd_iam_lfix.o osd_iam_lvar.o osd_io.o osd_compat.o
 
 EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
diff --git a/lustre/osd/autoMakefile.am b/lustre/osd/autoMakefile.am
index 8e88a77..93b59d5 100644
--- a/lustre/osd/autoMakefile.am
+++ b/lustre/osd/autoMakefile.am
@@ -35,8 +35,8 @@
 #
 
 if MODULES
-modulefs_DATA = osd$(KMODEXT)
+modulefs_DATA = osd-ldiskfs$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES := $(osd-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h
+DIST_SOURCES := $(osd-ldiskfs-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h
diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index 9c4908e..a6c1294 100644
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -2467,7 +2467,6 @@ static int osd_iam_index_probe(const struct lu_env *env, struct osd_object *o,
                            const struct dt_index_features *feat)
 {
         struct iam_descr *descr;
-        struct dt_object *dt = &o->oo_dt;
 
         if (osd_object_is_root(o))
                 return feat == &dt_directory_features;
@@ -2478,19 +2477,8 @@ static int osd_iam_index_probe(const struct lu_env *env, struct osd_object *o,
         if (feat == &dt_directory_features) {
                 if (descr->id_rec_size == sizeof(struct lu_fid_pack))
                         return 1;
-
-                if (descr == &iam_htree_compat_param) {
-                        /* if it is a HTREE dir then there is good chance that,
-                         * we dealing with ext3 directory here with no FIDs. */
-
-                        if (descr->id_rec_size ==
-                            sizeof ((struct ldiskfs_dir_entry_2 *)NULL)->inode) {
-
-                                dt->do_index_ops = &osd_index_ea_ops;
-                                return 1;
-                        }
-                }
-                return 0;
+                else
+                        return 0;
         } else {
                 return
                         feat->dif_keysize_min <= descr->id_key_size &&
-- 
1.8.3.1