From 960fa67bf99d2da147a0097c354ef0d081f9ce6e Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 26 Jul 2005 22:22:40 +0000 Subject: [PATCH] Branch b1_4 Remove obsolete extN usage, unused since Lustre 1.0 days. b=6437 --- lustre/autoconf/lustre-core.m4 | 13 ++----------- lustre/include/linux/lustre_compat25.h | 1 - lustre/include/linux/lustre_net.h | 2 +- lustre/lvfs/lvfs_internal.h | 3 --- lustre/obdfilter/filter_san.c | 2 +- lustre/tests/statmany.c | 4 ++-- lustre/tests/wantedi.c | 6 +++--- 7 files changed, 9 insertions(+), 22 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 294c1cf..f630bb2 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -303,21 +303,13 @@ fi # # LC_CONFIG_BACKINGFS # -# whether to use extN or ldiskfs instead of ext3 +# whether to use ldiskfs instead of ext3 # AC_DEFUN([LC_CONFIG_BACKINGFS], [ BACKINGFS='ext3' -# LLNL patches their ext3 and calls it extN -AC_MSG_CHECKING([whether to use extN]) -AC_ARG_ENABLE([extN], - AC_HELP_STRING([--enable-extN], - [use extN instead of ext3 for lustre backend]), - [BACKINGFS='extN'],[enable_extN='no']) -AC_MSG_RESULT([$enable_extN]) - -# SuSE gets ldiskfs +# 2.6 gets ldiskfs AC_MSG_CHECKING([whether to enable ldiskfs]) AC_ARG_ENABLE([ldiskfs], AC_HELP_STRING([--enable-ldiskfs], @@ -525,7 +517,6 @@ AC_CHECK_FUNCS([inet_ntoa]) # AC_DEFUN([LC_CONDITIONALS], [AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes) -AM_CONDITIONAL(EXTN, test x$enable_extN = xyes) AM_CONDITIONAL(LDISKFS, test x$enable_ldiskfs = xyes) AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno) AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes) diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index 35a7cde..96f4d7e 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -142,7 +142,6 @@ static inline int cleanup_group_info(void) #endif #define KDEVT_INIT(val) (val) #define ext3_xattr_set_handle ext3_xattr_set -#define extN_xattr_set_handle extN_xattr_set #define try_module_get __MOD_INC_USE_COUNT #define module_put __MOD_DEC_USE_COUNT #define LTIME_S(time) (time) diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h index d90ae57..e0470f4 100644 --- a/lustre/include/linux/lustre_net.h +++ b/lustre/include/linux/lustre_net.h @@ -119,7 +119,7 @@ MDT_MAX_THREADS), 2UL) #define MDS_NBUFS (64 * smp_num_cpus) #define MDS_BUFSIZE (8 * 1024) -/* Assume file name length = FNAME_MAX = 256 (true for extN). +/* Assume file name length = FNAME_MAX = 256 (true for ext3). * path name length = PATH_MAX = 4096 * LOV MD size max = EA_MAX = 4000 * symlink: FNAME_MAX + PATH_MAX <- largest diff --git a/lustre/lvfs/lvfs_internal.h b/lustre/lvfs/lvfs_internal.h index 4d68116..091fd99 100644 --- a/lustre/lvfs/lvfs_internal.h +++ b/lustre/lvfs/lvfs_internal.h @@ -1,8 +1,5 @@ int fsfilt_ext3_init(void); void fsfilt_ext3_exit(void); -int fsfilt_extN_init(void); -void fsfilt_extN_exit(void); - int fsfilt_reiser_init(void); void fsfilt_reiser_exit(void); diff --git a/lustre/obdfilter/filter_san.c b/lustre/obdfilter/filter_san.c index 0340d6b..bb931e7 100644 --- a/lustre/obdfilter/filter_san.c +++ b/lustre/obdfilter/filter_san.c @@ -49,7 +49,7 @@ int filter_san_setup(struct obd_device *obd, obd_count len, void *buf) if (!page) RETURN(-ENOMEM); - /* for extN/ext3 filesystem, we must mount it with 'writeback' mode */ + /* for ext3/ldiskfs filesystem, we must mount in 'writeback' mode */ if (!strcmp(lustre_cfg_string(lcfg, 2), "ldiskfs")) strcpy((void *)page, "data=writeback"); else if (!strcmp(lustre_cfg_string(lcfg, 2), "ext3")) diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c index af7c41f..ea3c411 100644 --- a/lustre/tests/statmany.c +++ b/lustre/tests/statmany.c @@ -12,7 +12,7 @@ #include #if 0 -#include +#include #endif #include #include @@ -153,7 +153,7 @@ int main(int argc, char ** argv) strerror(errno)); break; } - rc = ioctl(fd, EXTN_IOC_GETEA, NULL); + rc = ioctl(fd, LDISKFS_IOC_GETEA, NULL); if (rc < 0) { printf("ioctl(%s) error: %s\n", filename, strerror(errno)); diff --git a/lustre/tests/wantedi.c b/lustre/tests/wantedi.c index 94ed7495..78fd71b 100644 --- a/lustre/tests/wantedi.c +++ b/lustre/tests/wantedi.c @@ -21,7 +21,7 @@ static int usage(char *prog, FILE *out) exit(out == stderr); } -#define EXTN_IOC_CREATE_INUM _IOW('f', 5, long) +#define LDISKFS_IOC_CREATE_INUM _IOW('f', 5, long) int main(int argc, char ** argv) { @@ -39,9 +39,9 @@ int main(int argc, char ** argv) wantedi = atoi(argv[2]); printf("Creating %s/%d with ino %d\n", argv[1], wantedi, wantedi); - rc = ioctl(dirfd, EXTN_IOC_CREATE_INUM, wantedi); + rc = ioctl(dirfd, LDISKFS_IOC_CREATE_INUM, wantedi); if (rc < 0) { - perror("ioctl(EXTN_IOC_CREATE_INUM)"); + perror("ioctl(LDISKFS_IOC_CREATE_INUM)"); exit(2); } -- 1.8.3.1