LU-1199 build: Assume that ldiskfs PDO is now standard

PDO (Parallel Directory Operations) is now a standard ldiskfs feature.
The old patch series files that lacked PDO support have been removed
from the tree, so now we can drop all of the places that conditionally
use PDO, and just assume that PDO is standard.

Also remove support for rhel5 series file in ldiskfs, since that
no longer exists in the tree.

Change-Id: I76b5b31a4614c1ade3b4b5890a111cdabc4afa63
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/5004
Tested-by: Hudson
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Liang Zhen <liang.zhen@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>

diff --git a/build/autoconf/lustre-build-ldiskfs.m4 b/build/autoconf/lustre-build-ldiskfs.m4
index bff29da..59c281f 100644 (file)
--- a/build/autoconf/lustre-build-ldiskfs.m4
+++ b/build/autoconf/lustre-build-ldiskfs.m4
@@ -218,19 +218,6 @@ AC_DEFUN([LB_LDISKFS_DEFINE_OPTIONS],
 [
 AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
 
-with_ldiskfs_pdo=no
-case $LINUXRELEASE in
-2.6.32*)
-       if test x$RHEL_KERNEL = xyes; then
-               with_ldiskfs_pdo=yes
-               AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
-       fi
-       if test x$SUSE_KERNEL = xyes; then
-               with_ldiskfs_pdo=yes
-               AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
-       fi
-       ;;
-esac
 LB_LDISKFS_JBD2_JOURNAL_CALLBACK_SET
 
 AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1,

diff --git a/ldiskfs/config/ldiskfs-build.m4 b/ldiskfs/config/ldiskfs-build.m4
index 878fa99..680895e 100644 (file)
--- a/ldiskfs/config/ldiskfs-build.m4
+++ b/ldiskfs/config/ldiskfs-build.m4
@@ -616,21 +616,6 @@ fi
 #
 AC_DEFUN([LB_LDISKFS_DEFINE_OPTIONS],
 [
-AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
-
-with_ldiskfs_pdo=no
-case $LINUXRELEASE in
-2.6.32*)
-       if test x$RHEL_KERNEL = xyes; then
-               with_ldiskfs_pdo=yes
-               AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
-       fi
-       if test x$SUSE_KERNEL = xyes; then
-               with_ldiskfs_pdo=yes
-               AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
-       fi
-       ;;
-esac
 LB_LDISKFS_JBD2_JOURNAL_CALLBACK_SET
 
 AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1,
@@ -734,11 +719,6 @@ AC_DEFUN([LB_LDISKFS_SERIES],
 if $1; then
        AC_MSG_CHECKING([which ldiskfs series to use])
        case $LINUXRELEASE in
-       2.6.18*)
-               if test x$RHEL_KERNEL = xyes; then
-                       LDISKFS_SERIES="2.6-rhel5-ext4.series"
-               fi
-               ;;
        2.6.32*)
                if test x$RHEL_KERNEL = xyes; then
                        LDISKFS_SERIES="2.6-rhel6.series"

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 44b4983..1d838df 100644 (file)
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -81,8 +81,6 @@ LB_LDISKFS_EXT_SOURCE
 LB_LDISKFS_DEFINE_OPTIONS
 fi
 
-AM_CONDITIONAL(LDISKFS_PDO, test x$with_ldiskfs_pdo = xyes)
-
 AC_SUBST(ac_configure_args)
 
 AC_CONFIG_FILES([Makefile ldiskfs/Makefile]

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index a6e0e22..dd8b7ee 100644 (file)
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -8,7 +8,7 @@ backfs_extra := $(wildcard @LINUX@/fs/ext4/Makefile)
 backfs_headers := $(wildcard @EXT_DIR@/*.h)
 linux_headers := $(wildcard @LINUX@/include/linux/ext4*.h)
 linux_new_headers := dynlocks.h
-@LDISKFS_PDO_TRUE@linux_new_headers += htree_lock.h
+linux_new_headers += htree_lock.h
 trace_headers := $(wildcard @LINUX@/include/trace/events/ext4*.h)
 
 backfs_sources := $(filter-out %.mod.c,$(wildcard @EXT_DIR@/*.c))
@@ -17,7 +17,7 @@ ext3_new_sources := extents.c mballoc.c group.h dynlocks.c fiemap.h
 ext3_new_headers := ext3_extents.h
 
 ext4_new_sources := dynlocks.c fiemap.h mmp.c
-@LDISKFS_PDO_TRUE@ext4_new_sources += htree_lock.c
+ext4_new_sources += htree_lock.c
 ext4_new_headers :=
 
 new_sources := $(ext4_new_sources)

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index 6d0771e..2622a35 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -74,13 +74,9 @@
 #include <md_object.h>
 #include <lustre_quota.h>
 
-#ifdef HAVE_LDISKFS_PDO
 int ldiskfs_pdo = 1;
 CFS_MODULE_PARM(ldiskfs_pdo, "i", int, 0644,
                 "ldiskfs with parallel directory operations");
-#else
-int ldiskfs_pdo = 0;
-#endif
 
 static const char dot[] = ".";
 static const char dotdot[] = "..";

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index e972142..48f1bc5 100644 (file)
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -157,55 +157,11 @@ struct osd_obj_map {
        struct semaphore om_dir_init_sem;
 };
 
-#ifdef HAVE_LDISKFS_PDO
-
 #define osd_ldiskfs_find_entry(dir, dentry, de, lock)   \
         ll_ldiskfs_find_entry(dir, dentry, de, lock)
 #define osd_ldiskfs_add_entry(handle, child, cinode, hlock) \
         ldiskfs_add_entry(handle, child, cinode, hlock)
 
-#else /* HAVE_LDISKFS_PDO */
-
-struct htree_lock {
-        int     dummy;
-};
-
-struct htree_lock_head {
-        int     dummy;
-};
-
-#define ldiskfs_htree_lock(lock, head, inode, op)  do { LBUG(); } while (0)
-#define ldiskfs_htree_unlock(lock)                 do { LBUG(); } while (0)
-
-static inline struct htree_lock_head *ldiskfs_htree_lock_head_alloc(int dep)
-{
-        LBUG();
-        return NULL;
-}
-
-#define ldiskfs_htree_lock_head_free(lh)           do { LBUG(); } while (0)
-
-#define LDISKFS_DUMMY_HTREE_LOCK        0xbabecafe
-
-static inline struct htree_lock *ldiskfs_htree_lock_alloc(void)
-{
-        return (struct htree_lock *)LDISKFS_DUMMY_HTREE_LOCK;
-}
-
-static inline void ldiskfs_htree_lock_free(struct htree_lock *lk)
-{
-        LASSERT((unsigned long)lk == LDISKFS_DUMMY_HTREE_LOCK);
-}
-
-#define HTREE_HBITS_DEF         0
-
-#define osd_ldiskfs_find_entry(dir, dentry, de, lock)   \
-        ll_ldiskfs_find_entry(dir, dentry, de)
-#define osd_ldiskfs_add_entry(handle, child, cinode, lock) \
-        ldiskfs_add_entry(handle, child, cinode)
-
-#endif /* HAVE_LDISKFS_PDO */
-
 #define OSD_OTABLE_IT_CACHE_SIZE       128
 #define OSD_OTABLE_IT_CACHE_MASK       (~(OSD_OTABLE_IT_CACHE_SIZE - 1))
 

diff --git a/lustre/osd-ldiskfs/osd_lproc.c b/lustre/osd-ldiskfs/osd_lproc.c
index e3539a8..ae2e593 100644 (file)
--- a/lustre/osd-ldiskfs/osd_lproc.c
+++ b/lustre/osd-ldiskfs/osd_lproc.c
@@ -388,7 +388,6 @@ static int lprocfs_osd_wr_force_sync(struct file *file, const char *buffer,
        return rc == 0 ? count : rc;
 }
 
-#ifdef HAVE_LDISKFS_PDO
 static int lprocfs_osd_rd_pdo(char *page, char **start, off_t off, int count,
                               int *eof, void *data)
 {
@@ -411,7 +410,6 @@ static int lprocfs_osd_wr_pdo(struct file *file, const char *buffer,
 
         return count;
 }
-#endif
 
 static int lprocfs_osd_rd_auto_scrub(char *page, char **start, off_t off,
                                     int count, int *eof, void *data)
@@ -501,9 +499,7 @@ struct lprocfs_vars lprocfs_osd_obd_vars[] = {
         { "fstype",          lprocfs_osd_rd_fstype,      0, 0 },
         { "mntdev",          lprocfs_osd_rd_mntdev,      0, 0 },
        { "force_sync",      0, lprocfs_osd_wr_force_sync     },
-#ifdef HAVE_LDISKFS_PDO
         { "pdo",             lprocfs_osd_rd_pdo, lprocfs_osd_wr_pdo, 0 },
-#endif
        { "auto_scrub",      lprocfs_osd_rd_auto_scrub,
                             lprocfs_osd_wr_auto_scrub,  0 },
        { "oi_scrub",        lprocfs_osd_rd_oi_scrub,    0, 0 },