From 617d5a673cd16aa91fa9668b94cc385094fae852 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 15 Jan 2009 10:44:54 -0800 Subject: [PATCH] Rename modules to module and update references --- Makefile.am | 2 +- Makefile.in | 16 ++++++++-------- configure | 8 ++++---- configure.ac | 6 +++--- {modules => module}/Makefile.in | 0 {modules => module}/spl/Makefile.in | 0 {modules => module}/spl/spl-atomic.c | 0 {modules => module}/spl/spl-condvar.c | 0 {modules => module}/spl/spl-debug.c | 0 {modules => module}/spl/spl-err.c | 0 {modules => module}/spl/spl-generic.c | 0 {modules => module}/spl/spl-kmem.c | 0 {modules => module}/spl/spl-kobj.c | 0 {modules => module}/spl/spl-kstat.c | 0 {modules => module}/spl/spl-module.c | 0 {modules => module}/spl/spl-mutex.c | 0 {modules => module}/spl/spl-proc.c | 0 {modules => module}/spl/spl-rwlock.c | 0 {modules => module}/spl/spl-taskq.c | 0 {modules => module}/spl/spl-thread.c | 0 {modules => module}/spl/spl-time.c | 0 {modules => module}/spl/spl-vnode.c | 0 {modules => module}/splat/Makefile.in | 0 {modules => module}/splat/splat-atomic.c | 0 {modules => module}/splat/splat-condvar.c | 0 {modules => module}/splat/splat-ctl.c | 0 {modules => module}/splat/splat-generic.c | 0 {modules => module}/splat/splat-internal.h | 0 {modules => module}/splat/splat-kmem.c | 0 {modules => module}/splat/splat-kobj.c | 0 {modules => module}/splat/splat-list.c | 0 {modules => module}/splat/splat-mutex.c | 0 {modules => module}/splat/splat-random.c | 0 {modules => module}/splat/splat-rwlock.c | 0 {modules => module}/splat/splat-taskq.c | 0 {modules => module}/splat/splat-thread.c | 0 {modules => module}/splat/splat-time.c | 0 {modules => module}/splat/splat-vnode.c | 0 scripts/check.sh | 4 ++-- 39 files changed, 18 insertions(+), 18 deletions(-) rename {modules => module}/Makefile.in (100%) rename {modules => module}/spl/Makefile.in (100%) rename {modules => module}/spl/spl-atomic.c (100%) rename {modules => module}/spl/spl-condvar.c (100%) rename {modules => module}/spl/spl-debug.c (100%) rename {modules => module}/spl/spl-err.c (100%) rename {modules => module}/spl/spl-generic.c (100%) rename {modules => module}/spl/spl-kmem.c (100%) rename {modules => module}/spl/spl-kobj.c (100%) rename {modules => module}/spl/spl-kstat.c (100%) rename {modules => module}/spl/spl-module.c (100%) rename {modules => module}/spl/spl-mutex.c (100%) rename {modules => module}/spl/spl-proc.c (100%) rename {modules => module}/spl/spl-rwlock.c (100%) rename {modules => module}/spl/spl-taskq.c (100%) rename {modules => module}/spl/spl-thread.c (100%) rename {modules => module}/spl/spl-time.c (100%) rename {modules => module}/spl/spl-vnode.c (100%) rename {modules => module}/splat/Makefile.in (100%) rename {modules => module}/splat/splat-atomic.c (100%) rename {modules => module}/splat/splat-condvar.c (100%) rename {modules => module}/splat/splat-ctl.c (100%) rename {modules => module}/splat/splat-generic.c (100%) rename {modules => module}/splat/splat-internal.h (100%) rename {modules => module}/splat/splat-kmem.c (100%) rename {modules => module}/splat/splat-kobj.c (100%) rename {modules => module}/splat/splat-list.c (100%) rename {modules => module}/splat/splat-mutex.c (100%) rename {modules => module}/splat/splat-random.c (100%) rename {modules => module}/splat/splat-rwlock.c (100%) rename {modules => module}/splat/splat-taskq.c (100%) rename {modules => module}/splat/splat-thread.c (100%) rename {modules => module}/splat/splat-time.c (100%) rename {modules => module}/splat/splat-vnode.c (100%) diff --git a/Makefile.am b/Makefile.am index 1d219cd85..e0c5fe29e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-zip -SUBDIRS = lib cmd modules include scripts +SUBDIRS = lib cmd module include scripts CONFIG_CLEAN_FILES = aclocal.m4 config.guess config.sub CONFIG_CLEAN_FILES += depcomp install-sh missing mkinstalldirs EXTRA_DIST = autogen.sh diff --git a/Makefile.in b/Makefile.in index 8eea6c97d..834d7f74b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,9 +38,9 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/spl_config.h.in \ - $(top_srcdir)/configure $(top_srcdir)/modules/Makefile.in \ - $(top_srcdir)/modules/spl/Makefile.in \ - $(top_srcdir)/modules/splat/Makefile.in AUTHORS COPYING \ + $(top_srcdir)/configure $(top_srcdir)/module/Makefile.in \ + $(top_srcdir)/module/spl/Makefile.in \ + $(top_srcdir)/module/splat/Makefile.in AUTHORS COPYING \ ChangeLog INSTALL config/config.guess config/config.sub \ config/depcomp config/install-sh config/ltmain.sh \ config/missing @@ -196,7 +196,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ AUTOMAKE_OPTIONS = foreign dist-zip -SUBDIRS = lib cmd modules include scripts +SUBDIRS = lib cmd module include scripts CONFIG_CLEAN_FILES = aclocal.m4 config.guess config.sub depcomp \ install-sh missing mkinstalldirs EXTRA_DIST = autogen.sh @@ -254,11 +254,11 @@ $(srcdir)/spl_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f spl_config.h stamp-h1 -modules/Makefile: $(top_builddir)/config.status $(top_srcdir)/modules/Makefile.in +module/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -modules/spl/Makefile: $(top_builddir)/config.status $(top_srcdir)/modules/spl/Makefile.in +module/spl/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/spl/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -modules/splat/Makefile: $(top_builddir)/config.status $(top_srcdir)/modules/splat/Makefile.in +module/splat/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/splat/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: @@ -406,7 +406,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/config $(distdir)/modules $(distdir)/modules/spl $(distdir)/modules/splat $(distdir)/scripts + $(mkdir_p) $(distdir)/config $(distdir)/module $(distdir)/module/spl $(distdir)/module/splat $(distdir)/scripts @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/configure b/configure index c0b771407..2ecf422f0 100755 --- a/configure +++ b/configure @@ -20439,7 +20439,7 @@ fi - ac_config_files="$ac_config_files Makefile lib/Makefile cmd/Makefile modules/Makefile modules/spl/Makefile modules/splat/Makefile include/Makefile include/sys/Makefile scripts/Makefile scripts/spl.spec" + ac_config_files="$ac_config_files Makefile lib/Makefile cmd/Makefile module/Makefile module/spl/Makefile module/splat/Makefile include/Makefile include/sys/Makefile scripts/Makefile scripts/spl.spec" cat >confcache <<\_ACEOF @@ -21008,9 +21008,9 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "cmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;; - "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; - "modules/spl/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/spl/Makefile" ;; - "modules/splat/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/splat/Makefile" ;; + "module/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/Makefile" ;; + "module/spl/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/spl/Makefile" ;; + "module/splat/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/splat/Makefile" ;; "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "include/sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/sys/Makefile" ;; "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; diff --git a/configure.ac b/configure.ac index ca19adc4e..1db1efbf9 100644 --- a/configure.ac +++ b/configure.ac @@ -86,9 +86,9 @@ AC_SUBST(KERNELCFLAGS) AC_CONFIG_FILES([ Makefile lib/Makefile cmd/Makefile - modules/Makefile - modules/spl/Makefile - modules/splat/Makefile + module/Makefile + module/spl/Makefile + module/splat/Makefile include/Makefile include/sys/Makefile scripts/Makefile diff --git a/modules/Makefile.in b/module/Makefile.in similarity index 100% rename from modules/Makefile.in rename to module/Makefile.in diff --git a/modules/spl/Makefile.in b/module/spl/Makefile.in similarity index 100% rename from modules/spl/Makefile.in rename to module/spl/Makefile.in diff --git a/modules/spl/spl-atomic.c b/module/spl/spl-atomic.c similarity index 100% rename from modules/spl/spl-atomic.c rename to module/spl/spl-atomic.c diff --git a/modules/spl/spl-condvar.c b/module/spl/spl-condvar.c similarity index 100% rename from modules/spl/spl-condvar.c rename to module/spl/spl-condvar.c diff --git a/modules/spl/spl-debug.c b/module/spl/spl-debug.c similarity index 100% rename from modules/spl/spl-debug.c rename to module/spl/spl-debug.c diff --git a/modules/spl/spl-err.c b/module/spl/spl-err.c similarity index 100% rename from modules/spl/spl-err.c rename to module/spl/spl-err.c diff --git a/modules/spl/spl-generic.c b/module/spl/spl-generic.c similarity index 100% rename from modules/spl/spl-generic.c rename to module/spl/spl-generic.c diff --git a/modules/spl/spl-kmem.c b/module/spl/spl-kmem.c similarity index 100% rename from modules/spl/spl-kmem.c rename to module/spl/spl-kmem.c diff --git a/modules/spl/spl-kobj.c b/module/spl/spl-kobj.c similarity index 100% rename from modules/spl/spl-kobj.c rename to module/spl/spl-kobj.c diff --git a/modules/spl/spl-kstat.c b/module/spl/spl-kstat.c similarity index 100% rename from modules/spl/spl-kstat.c rename to module/spl/spl-kstat.c diff --git a/modules/spl/spl-module.c b/module/spl/spl-module.c similarity index 100% rename from modules/spl/spl-module.c rename to module/spl/spl-module.c diff --git a/modules/spl/spl-mutex.c b/module/spl/spl-mutex.c similarity index 100% rename from modules/spl/spl-mutex.c rename to module/spl/spl-mutex.c diff --git a/modules/spl/spl-proc.c b/module/spl/spl-proc.c similarity index 100% rename from modules/spl/spl-proc.c rename to module/spl/spl-proc.c diff --git a/modules/spl/spl-rwlock.c b/module/spl/spl-rwlock.c similarity index 100% rename from modules/spl/spl-rwlock.c rename to module/spl/spl-rwlock.c diff --git a/modules/spl/spl-taskq.c b/module/spl/spl-taskq.c similarity index 100% rename from modules/spl/spl-taskq.c rename to module/spl/spl-taskq.c diff --git a/modules/spl/spl-thread.c b/module/spl/spl-thread.c similarity index 100% rename from modules/spl/spl-thread.c rename to module/spl/spl-thread.c diff --git a/modules/spl/spl-time.c b/module/spl/spl-time.c similarity index 100% rename from modules/spl/spl-time.c rename to module/spl/spl-time.c diff --git a/modules/spl/spl-vnode.c b/module/spl/spl-vnode.c similarity index 100% rename from modules/spl/spl-vnode.c rename to module/spl/spl-vnode.c diff --git a/modules/splat/Makefile.in b/module/splat/Makefile.in similarity index 100% rename from modules/splat/Makefile.in rename to module/splat/Makefile.in diff --git a/modules/splat/splat-atomic.c b/module/splat/splat-atomic.c similarity index 100% rename from modules/splat/splat-atomic.c rename to module/splat/splat-atomic.c diff --git a/modules/splat/splat-condvar.c b/module/splat/splat-condvar.c similarity index 100% rename from modules/splat/splat-condvar.c rename to module/splat/splat-condvar.c diff --git a/modules/splat/splat-ctl.c b/module/splat/splat-ctl.c similarity index 100% rename from modules/splat/splat-ctl.c rename to module/splat/splat-ctl.c diff --git a/modules/splat/splat-generic.c b/module/splat/splat-generic.c similarity index 100% rename from modules/splat/splat-generic.c rename to module/splat/splat-generic.c diff --git a/modules/splat/splat-internal.h b/module/splat/splat-internal.h similarity index 100% rename from modules/splat/splat-internal.h rename to module/splat/splat-internal.h diff --git a/modules/splat/splat-kmem.c b/module/splat/splat-kmem.c similarity index 100% rename from modules/splat/splat-kmem.c rename to module/splat/splat-kmem.c diff --git a/modules/splat/splat-kobj.c b/module/splat/splat-kobj.c similarity index 100% rename from modules/splat/splat-kobj.c rename to module/splat/splat-kobj.c diff --git a/modules/splat/splat-list.c b/module/splat/splat-list.c similarity index 100% rename from modules/splat/splat-list.c rename to module/splat/splat-list.c diff --git a/modules/splat/splat-mutex.c b/module/splat/splat-mutex.c similarity index 100% rename from modules/splat/splat-mutex.c rename to module/splat/splat-mutex.c diff --git a/modules/splat/splat-random.c b/module/splat/splat-random.c similarity index 100% rename from modules/splat/splat-random.c rename to module/splat/splat-random.c diff --git a/modules/splat/splat-rwlock.c b/module/splat/splat-rwlock.c similarity index 100% rename from modules/splat/splat-rwlock.c rename to module/splat/splat-rwlock.c diff --git a/modules/splat/splat-taskq.c b/module/splat/splat-taskq.c similarity index 100% rename from modules/splat/splat-taskq.c rename to module/splat/splat-taskq.c diff --git a/modules/splat/splat-thread.c b/module/splat/splat-thread.c similarity index 100% rename from modules/splat/splat-thread.c rename to module/splat/splat-thread.c diff --git a/modules/splat/splat-time.c b/module/splat/splat-time.c similarity index 100% rename from modules/splat/splat-time.c rename to module/splat/splat-time.c diff --git a/modules/splat/splat-vnode.c b/module/splat/splat-vnode.c similarity index 100% rename from modules/splat/splat-vnode.c rename to module/splat/splat-vnode.c diff --git a/scripts/check.sh b/scripts/check.sh index 81f2fdde3..37f77853a 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -1,8 +1,8 @@ #!/bin/bash prog=check.sh -spl_module=../modules/spl/spl.ko -splat_module=../modules/splat/splat.ko +spl_module=../module/spl/spl.ko +splat_module=../module/splat/splat.ko splat_cmd=../cmd/splat verbose=