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>
[
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,
#
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,
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"
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]
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))
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)
#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[] = "..";
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))
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)
{
return count;
}
-#endif
static int lprocfs_osd_rd_auto_scrub(char *page, char **start, off_t off,
int count, int *eof, void *data)
{ "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 },