[Ocfs2-commits] jlbec commits r2069 - in trunk/fs: . configfs ocfs2 ocfs2/cluster ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: jlbec
Signed-off-by: manish
Date: 2005-03-29 15:28:38 -0600 (Tue, 29 Mar 2005)
New Revision: 2069

Added:
   trunk/fs/configfs/
Removed:
   trunk/fs/usysfs/
Modified:
   trunk/fs/Makefile
   trunk/fs/configfs/Makefile
   trunk/fs/ocfs2/Makefile
   trunk/fs/ocfs2/cluster/Makefile
   trunk/fs/ocfs2/dlm/Makefile
Log:

Starting the usysfs->configfs rename.

o Move fs/usysfs to fs/configfs.
o Fix all the Makefiles to look at fs/configfs
o Rename the module configfs.ko

Signed-off-by: manish



Modified: trunk/fs/Makefile
===================================================================
--- trunk/fs/Makefile	2005-03-29 19:08:08 UTC (rev 2068)
+++ trunk/fs/Makefile	2005-03-29 21:28:38 UTC (rev 2069)
@@ -16,7 +16,7 @@
 # As 2.6 kbuild is unhappy seeing SUBDIRS, this is a safe one to
 # set globally.  Do not include trailing slashes.
 #
-SAFE_SUBDIRS := usysfs ocfs2
+SAFE_SUBDIRS := configfs ocfs2
 
 ifneq ($(KERNELRELEASE),)
 #
@@ -63,7 +63,7 @@
 #
 
 # WARNING WARNING WARNING HACK HACK HACK
-# 2.4 doesn't build usysfs yet
+# 2.4 doesn't build configfs yet
 SUBDIRS = $(SAFE_SUBDIRS)
 
 endif

Copied: trunk/fs/configfs (from rev 2068, trunk/fs/usysfs)

Modified: trunk/fs/configfs/Makefile
===================================================================
--- trunk/fs/usysfs/Makefile	2005-03-29 19:08:08 UTC (rev 2068)
+++ trunk/fs/configfs/Makefile	2005-03-29 21:28:38 UTC (rev 2069)
@@ -11,10 +11,10 @@
 include $(OUR_TOPDIR)/Config.make
 endif
 
-INSTALL_MOD_DIR := fs/usysfs
+INSTALL_MOD_DIR := fs/configfs
 
-obj-m		:= usysfs.o bobtest.o
-usysfs-objs	:= inode.o file.o dir.o symlink.o mount.o uobject.o
+obj-m		:= configfs.o bobtest.o
+configfs-objs	:= inode.o file.o dir.o symlink.o mount.o uobject.o
 		   
 ifeq ($(KERNELRELEASE),)
 #
@@ -30,9 +30,9 @@
 	compatinclude/linux/compat_libfs.h
 
 # Get the kobject includes, as this is a 2.4 build
-EXTRA_CFLAGS += -I$(TOPDIR)/fs/usysfs/compatinclude
+EXTRA_CFLAGS += -I$(TOPDIR)/fs/configfs/compatinclude
 
-USYSFS_SOURCES = 		\
+CONFIGFS_SOURCES = 		\
 	dir.c			\
 	file.c			\
 	inode.c			\
@@ -41,12 +41,12 @@
 	uobject.c		\
 	compat_kref.c		\
 	compat_libfs.c
-USYSFS_OBJECTS = $(subst .c,.o,$(USYSFS_SOURCES))
+CONFIGFS_OBJECTS = $(subst .c,.o,$(CONFIGFS_SOURCES))
 
 BOBTEST_SOURCES = bobtest.c
 BOBTEST_OBJECTS = $(subst .c,.o,$(BOBTEST_SOURCES))
 
-DIST_FILES = $(USYSFS_SOURCES) $(BOBTEST_SOURCES) $(HEADERS)
+DIST_FILES = $(CONFIGFS_SOURCES) $(BOBTEST_SOURCES) $(HEADERS)
 
 ALL_RULES = build-modules
 

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-03-29 19:08:08 UTC (rev 2068)
+++ trunk/fs/ocfs2/Makefile	2005-03-29 21:28:38 UTC (rev 2069)
@@ -11,8 +11,8 @@
 include $(OUR_TOPDIR)/Config.make
 
 CLUSTERINC := $(OUR_TOPDIR)/fs/ocfs2
-USYSFSINC := $(OUR_TOPDIR)/fs/usysfs
-EXTRA_CFLAGS += -I$(CLUSTERINC) -I$(USYSFSINC)
+CONFIGFSINC := $(OUR_TOPDIR)/fs/configfs
+EXTRA_CFLAGS += -I$(CLUSTERINC) -I$(CONFIGFSINC)
 
 endif
 

Modified: trunk/fs/ocfs2/cluster/Makefile
===================================================================
--- trunk/fs/ocfs2/cluster/Makefile	2005-03-29 19:08:08 UTC (rev 2068)
+++ trunk/fs/ocfs2/cluster/Makefile	2005-03-29 21:28:38 UTC (rev 2069)
@@ -16,10 +16,10 @@
 EXTRA_CFLAGS += -DMISSING_SOCK_CREATE_LITE
 endif
 
-# this is going to get exciting if usysfs is merged
-EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/usysfs/
+# this is going to get exciting if configfs is merged
+EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/configfs/
 # XXX should be folded into the kapi stuff
-EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/usysfs/compatinclude
+EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/configfs/compatinclude
 ifneq ($(QUIET),1)
 EXTRA_CFLAGS += -DENABLE_HBPRINTK
 EXTRA_CFLAGS += -DENABLE_NMPRINTK

Modified: trunk/fs/ocfs2/dlm/Makefile
===================================================================
--- trunk/fs/ocfs2/dlm/Makefile	2005-03-29 19:08:08 UTC (rev 2068)
+++ trunk/fs/ocfs2/dlm/Makefile	2005-03-29 21:28:38 UTC (rev 2069)
@@ -12,11 +12,11 @@
 
 include $(OUR_TOPDIR)/Config.make
 CLUSTERINC = $(OUR_TOPDIR)/fs/ocfs2
-USYSFSINC = $(OUR_TOPDIR)/fs/usysfs
+CONFIGFSINC = $(OUR_TOPDIR)/fs/configfs
 
 endif
 
-EXTRA_CFLAGS += -I$(CLUSTERINC) -I$(USYSFSINC)
+EXTRA_CFLAGS += -I$(CLUSTERINC) -I$(CONFIGFSINC)
 
 ifneq ($(QUIET),1)
 EXTRA_CFLAGS += -DENABLE_DLMPRINTK