[Ocfs2-devel] Initial patches for ocfs2 1.6

[Ocfs2-devel] Initial patches for ocfs2 1.6

[Sunil Mushran]

So the ocfs2 1.6 repository is up. It is a copy of the fs in the mainline.
I have some 70-80 patches that will make it run atop el5 u4. The patches
will be posted in smaller batches so as to make it easier to review.

The first set handles the makefiles, etc.

Sunil

[Ocfs2-devel] [PATCH 1/4] ocfs2: Add .gitignore

[Sunil Mushran]

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 .gitignore                  |   43 +++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/.gitignore         |   35 +++++++++++++++++++++++++++++++++++
 fs/ocfs2/cluster/.gitignore |   35 +++++++++++++++++++++++++++++++++++
 fs/ocfs2/dlm/.gitignore     |   35 +++++++++++++++++++++++++++++++++++
 4 files changed, 148 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 fs/ocfs2/.gitignore
 create mode 100644 fs/ocfs2/cluster/.gitignore
 create mode 100644 fs/ocfs2/dlm/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9346a6d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,43 @@
+#
+# Normal rules
+#
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.mod.c
+*.i
+.*.sw?
+*.pc
+
+#
+# Top-level generic files
+#
+!.gitignore
+!.mailmap
+
+# cscope files
+cscope.*
+ncscope.*
+
+# autoconf files
+Config.make
+autom4te.cache
+config.log
+config.status
+configure
+
+# misc
+stamp-md5
+*.orig
+*~
+\#*#
+
+Module.markers
+Module.symvers
+
+ocfs2-*.src.rpm
+ocfs2-*.tar.gz
diff --git a/fs/ocfs2/.gitignore b/fs/ocfs2/.gitignore
new file mode 100644
index 0000000..eca2a17
--- /dev/null
+++ b/fs/ocfs2/.gitignore
@@ -0,0 +1,35 @@
+#
+# Normal rules
+#
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.mod.c
+*.i
+
+#
+# Top-level generic files
+#
+!.gitignore
+!.mailmap
+
+# cscope files
+cscope.*
+ncscope.*
+
+# autoconf files
+Config.make
+autom4te.cache
+config.log
+config.status
+configure
+
+# misc
+stamp-md5
+*.orig
+*~
+\#*#
diff --git a/fs/ocfs2/cluster/.gitignore b/fs/ocfs2/cluster/.gitignore
new file mode 100644
index 0000000..eca2a17
--- /dev/null
+++ b/fs/ocfs2/cluster/.gitignore
@@ -0,0 +1,35 @@
+#
+# Normal rules
+#
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.mod.c
+*.i
+
+#
+# Top-level generic files
+#
+!.gitignore
+!.mailmap
+
+# cscope files
+cscope.*
+ncscope.*
+
+# autoconf files
+Config.make
+autom4te.cache
+config.log
+config.status
+configure
+
+# misc
+stamp-md5
+*.orig
+*~
+\#*#
diff --git a/fs/ocfs2/dlm/.gitignore b/fs/ocfs2/dlm/.gitignore
new file mode 100644
index 0000000..eca2a17
--- /dev/null
+++ b/fs/ocfs2/dlm/.gitignore
@@ -0,0 +1,35 @@
+#
+# Normal rules
+#
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.mod.c
+*.i
+
+#
+# Top-level generic files
+#
+!.gitignore
+!.mailmap
+
+# cscope files
+cscope.*
+ncscope.*
+
+# autoconf files
+Config.make
+autom4te.cache
+config.log
+config.status
+configure
+
+# misc
+stamp-md5
+*.orig
+*~
+\#*#
-- 
1.5.6.5

[Ocfs2-devel] [PATCH 2/4] ocfs2: Copy Makefiles from ocfs2-1.4

[Sunil Mushran]

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/Makefile         |  212 ++++++++++++++++++++++++++++++++++-----------
 fs/ocfs2/cluster/Makefile |   89 ++++++++++++++++++-
 fs/ocfs2/dlm/Makefile     |  105 +++++++++++++++++++++-
 3 files changed, 347 insertions(+), 59 deletions(-)

diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile
index 31f25ce..7438431 100644
--- a/fs/ocfs2/Makefile
+++ b/fs/ocfs2/Makefile
@@ -1,54 +1,164 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
-
-EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
-
-obj-$(CONFIG_OCFS2_FS) += 	\
-	ocfs2.o			\
-	ocfs2_stackglue.o
-
-obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_stack_o2cb.o
-obj-$(CONFIG_OCFS2_FS_USERSPACE_CLUSTER) += ocfs2_stack_user.o
-
-ocfs2-objs := \
-	alloc.o 		\
-	aops.o 			\
-	blockcheck.o		\
-	buffer_head_io.o	\
-	dcache.o 		\
-	dir.o 			\
-	dlmglue.o 		\
-	export.o 		\
-	extent_map.o 		\
-	file.o 			\
-	heartbeat.o 		\
-	inode.o 		\
-	ioctl.o 		\
-	journal.o 		\
-	localalloc.o 		\
-	locks.o			\
-	mmap.o 			\
-	namei.o 		\
-	refcounttree.o		\
-	resize.o		\
-	slot_map.o 		\
-	suballoc.o 		\
-	super.o 		\
-	symlink.o 		\
-	sysfile.o 		\
-	uptodate.o		\
-	ver.o			\
-	quota_local.o		\
-	quota_global.o		\
-	xattr.o
-
-ifeq ($(CONFIG_OCFS2_FS_POSIX_ACL),y)
-ocfs2-objs += acl.o
+
+ifeq ($(KERNELRELEASE),)
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+else
+# We are included by kbuild.
+
+OUR_TOPDIR	:= $(M)/..
+
+include $(OUR_TOPDIR)/Config.make
+
+endif
+
+COMPAT_SOURCES =
+COMPAT_HEADERS =
+SOURCES =
+HEADERS =
+
+EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/ocfs2
+
+ifdef OCFS_DEBUG
+EXTRA_CFLAGS += -g
+EXTRA_CFLAGS += -DDEBUG
+endif
+
+EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES -DOCFS2_ORACORE_WORKAROUNDS
+
+EXTRA_CFLAGS += -DOCFS2_CDSL
+
+EXTRA_CFLAGS += -DCONFIG_OCFS2_DEBUG_MASKLOG
+
+EXTRA_CFLAGS += -DCONFIG_OCFS2_FS_STATS
+
+#
+# Since SUBDIRS means something to kbuild, define them safely.  Do not
+# include trailing slashes.
+#
+SAFE_SUBDIRS = cluster dlm
+
+SOURCES +=			\
+	acl.c			\
+	alloc.c 		\
+	aops.c 			\
+	blockcheck.c		\
+	buffer_head_io.c	\
+	dcache.c 		\
+	dir.c 			\
+	dlmglue.c 		\
+	export.c		\
+	extent_map.c 		\
+	file.c 			\
+	heartbeat.c 		\
+	inode.c 		\
+	ioctl.c			\
+	journal.c 		\
+	localalloc.c 		\
+	locks.c			\
+	mmap.c 			\
+	namei.c 		\
+	quota_global.c		\
+	quota_local.c		\
+	resize.c		\
+	slot_map.c 		\
+	stackglue.c		\
+	stack_o2cb.c		\
+	stack_user.c		\
+	suballoc.c 		\
+	super.c 		\
+	symlink.c 		\
+	sysfile.c 		\
+	uptodate.c		\
+	ver.c			\
+	xattr.c
+
+HEADERS += 			\
+	acl.h			\
+	alloc.h			\
+	aops.h			\
+	blockcheck.h		\
+	buffer_head_io.h	\
+	dcache.h		\
+	dir.h			\
+	dlmglue.h		\
+	export.h		\
+	extent_map.h		\
+	file.h			\
+	heartbeat.h		\
+	inode.h			\
+	ioctl.h			\
+	journal.h		\
+	localalloc.h		\
+	locks.h			\
+	mmap.h			\
+	namei.h			\
+	ocfs1_fs_compat.h	\
+	ocfs2_fs.h		\
+	ocfs2.h			\
+	ocfs2_lockid.h		\
+	ocfs2_lockingver.h	\
+	quota.h			\
+	resize.h		\
+	slot_map.h		\
+	stackglue.h		\
+	suballoc.h		\
+	super.h			\
+	symlink.h		\
+	sysfile.h		\
+	uptodate.h		\
+	ver.h			\
+	xattr.h
+
+OBJECTS = $(subst .c,.o,$(SOURCES))
+VERSION_FILES = $(SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+VERSION_SRC = ver.c
+VERSION_PREFIX = OCFS2
+
+INSTALL_MOD_DIR := fs/ocfs2
+
+obj-m := ocfs2.o
+
+ocfs2-objs := $(OBJECTS)
+
+ifneq ($(KERNELRELEASE),)
+#
+# Argh, Versioning.make has ordering requirements, so we put this here
+#
+STAMP_DIR	:= $(OUR_TOPDIR)/fs/ocfs2
+include $(OUR_TOPDIR)/Versioning.make
+CFLAGS_$(VERSION_OBJ) += $(VERDEFS)
+
+obj-m += $(addsuffix /,$(SAFE_SUBDIRS))
 endif
 
-ocfs2_stackglue-objs := stackglue.o
-ocfs2_stack_o2cb-objs := stack_o2cb.o
-ocfs2_stack_user-objs := stack_user.o
+ifeq ($(KERNELRELEASE),)
+#
+# Called from a regular "make". Just forward to kbuild.
+#
+
+DIST_FILES = $(SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+
+ALL_RULES = stamp-md5 build-modules
+
+CLEAN_RULES = clean-modules
 
-# cluster/ is always needed when OCFS2_FS for masklog support
-obj-$(CONFIG_OCFS2_FS) += cluster/
-obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/
+INSTALL_RULES = install-modules
+
+# Traverse subdirs via Makebo for "make dist"
+ifeq ($(MAKECMDGOALS),dist-all)
+SUBDIRS = $(SAFE_SUBDIRS)
+endif
+
+build-modules:
+	$(MAKE) -C $(TOPDIR)/fs build-modules
+
+install-modules:
+	$(MAKE) -C $(TOPDIR)/fs install-modules
+
+clean-modules:
+	$(MAKE) -C $(TOPDIR)/fs clean-modules
+
+include $(TOPDIR)/Postamble.make
+
+endif
diff --git a/fs/ocfs2/cluster/Makefile b/fs/ocfs2/cluster/Makefile
index bc8c5e7..fc5d3a0 100644
--- a/fs/ocfs2/cluster/Makefile
+++ b/fs/ocfs2/cluster/Makefile
@@ -1,4 +1,87 @@
-obj-$(CONFIG_OCFS2_FS) += ocfs2_nodemanager.o
 
-ocfs2_nodemanager-objs := heartbeat.o masklog.o sys.o nodemanager.o \
-	quorum.o tcp.o netdebug.o ver.o
+ifeq ($(KERNELRELEASE),)
+TOPDIR = ../../..
+
+include $(TOPDIR)/Preamble.make
+else
+# We are included by kbuild.
+
+OUR_TOPDIR	:= $(M)/..
+
+include $(OUR_TOPDIR)/Config.make
+endif
+
+COMPAT_SOURCES =
+COMPAT_HEADERS =
+SOURCES =
+HEADERS =
+
+EXTRA_CFLAGS += -DCONFIG_OCFS2_DEBUG_MASKLOG
+
+SOURCES +=			\
+	heartbeat.c		\
+	masklog.c		\
+	netdebug.c		\
+	nodemanager.c		\
+	quorum.c		\
+	sys.c			\
+	tcp.c			\
+	ver.c
+
+HEADERS += 			\
+	heartbeat.h		\
+	masklog.h		\
+	nodemanager.h		\
+	ocfs2_heartbeat.h	\
+	ocfs2_nodemanager.h	\
+	quorum.h		\
+	sys.h			\
+	tcp.h			\
+	tcp_internal.h		\
+	ver.h
+
+OBJECTS = $(subst .c,.o,$(SOURCES))
+VERSION_FILES = $(SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+VERSION_SRC = ver.c
+VERSION_PREFIX = CLUSTER
+
+INSTALL_MOD_DIR := fs/ocfs2
+
+obj-m := ocfs2_nodemanager.o
+
+ocfs2_nodemanager-objs := $(OBJECTS)
+
+ifneq ($(KERNELRELEASE),)
+#
+# Argh, Versioning.make has ordering requirements, so we put this here
+#
+STAMP_DIR	:= $(OUR_TOPDIR)/fs/ocfs2/cluster
+include $(OUR_TOPDIR)/Versioning.make
+CFLAGS_$(VERSION_OBJ) += $(VERDEFS)
+endif
+
+ifeq ($(KERNELRELEASE),)
+#
+# Called from a regular "make". Just forward to kbuild.
+#
+
+DIST_FILES = $(SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+
+ALL_RULES = stamp-md5 build-modules
+
+CLEAN_RULES = clean-modules
+
+INSTALL_RULES = install-modules
+
+build-modules:
+	$(MAKE) -C $(TOPDIR)/fs build-modules
+
+install-modules:
+	$(MAKE) -C $(TOPDIR)/fs install-modules
+
+clean-modules:
+	$(MAKE) -C $(TOPDIR)/fs clean-modules
+
+include $(TOPDIR)/Postamble.make
+
+endif
diff --git a/fs/ocfs2/dlm/Makefile b/fs/ocfs2/dlm/Makefile
index 1903613..26cbf6c 100644
--- a/fs/ocfs2/dlm/Makefile
+++ b/fs/ocfs2/dlm/Makefile
@@ -1,8 +1,103 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
 
-obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlmfs.o
+ifeq ($(KERNELRELEASE),)
+TOPDIR = ../../..
 
-ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \
-	dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o
+include $(TOPDIR)/Preamble.make
 
-ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o
+else
+# We are included by kbuild.
+
+OUR_TOPDIR	:= $(M)/..
+
+include $(OUR_TOPDIR)/Config.make
+endif
+
+COMPAT_SOURCES =
+COMPAT_HEADERS =
+DLM_SOURCES =
+DLMFS_SOURCES =
+HEADERS =
+
+EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/ocfs2
+
+EXTRA_CFLAGS += -DCONFIG_OCFS2_DEBUG_MASKLOG
+
+DLM_SOURCES +=			\
+	dlmast.c		\
+	dlmconvert.c		\
+	dlmdebug.c		\
+	dlmdomain.c		\
+	dlmlock.c		\
+	dlmmaster.c		\
+	dlmrecovery.c		\
+	dlmthread.c		\
+	dlmunlock.c		\
+	dlmver.c
+
+DLMFS_SOURCES += \
+	userdlm.c		\
+	dlmfs.c			\
+	dlmfsver.c
+
+HEADERS += 			\
+	dlmapi.h		\
+	dlmcommon.h		\
+	dlmconvert.h		\
+	dlmdebug.h		\
+	dlmdomain.h		\
+	dlmfsver.h		\
+	dlmver.h		\
+	userdlm.h
+
+DLM_OBJECTS = $(subst .c,.o,$(DLM_SOURCES))
+DLMFS_OBJECTS = $(subst .c,.o,$(DLMFS_SOURCES))
+
+VERSION_FILES = $(DLM_SOURCES) $(DLMFS_SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+VERSION_SRC = dlmver.c dlmfsver.c
+VERSION_PREFIX = DLM
+
+INSTALL_MOD_DIR := fs/ocfs2
+
+obj-m := ocfs2_dlm.o ocfs2_dlmfs.o
+
+ocfs2_dlm-objs := $(DLM_OBJECTS)
+
+ocfs2_dlmfs-objs := $(DLMFS_OBJECTS)
+
+ifneq ($(KERNELRELEASE),)
+#
+# Argh, Versioning.make has ordering requirements, so we put this here
+#
+STAMP_DIR       := $(OUR_TOPDIR)/fs/ocfs2/dlm
+include $(OUR_TOPDIR)/Versioning.make
+endif
+
+# This has to be outside a conditional, because of a bug in make
+# It's harmless in the regular make case, as VERSION_OBJ will be empty
+$(foreach objfile,$(VERSION_OBJ),$(eval CFLAGS_$(objfile) += $(VERDEFS)))
+
+ifeq ($(KERNELRELEASE),)
+#
+# Called from a regular "make". Just forward to kbuild.
+#
+
+DIST_FILES = $(DLM_SOURCES) $(DLMFS_SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+
+ALL_RULES = stamp-md5 build-modules
+
+CLEAN_RULES = clean-modules
+
+INSTALL_RULES = install-modules
+
+build-modules:
+	$(MAKE) -C $(TOPDIR)/fs build-modules
+
+install-modules:
+	$(MAKE) -C $(TOPDIR)/fs install-modules
+
+clean-modules:
+	$(MAKE) -C $(TOPDIR)/fs clean-modules
+
+include $(TOPDIR)/Postamble.make
+
+endif
-- 
1.5.6.5

[Ocfs2-devel] [PATCH 3/4] ocfs2: Fix ocfs2 makefile

[Sunil Mushran]

Teach the makefile to handle stackglue and friends.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/Makefile |  115 ++++++++++++++++-------------------------------------
 1 files changed, 34 insertions(+), 81 deletions(-)

diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile
index 7438431..8222d03 100644
--- a/fs/ocfs2/Makefile
+++ b/fs/ocfs2/Makefile
@@ -14,8 +14,12 @@ endif
 
 COMPAT_SOURCES =
 COMPAT_HEADERS =
-SOURCES =
-HEADERS =
+FS_SOURCES =
+FS_HEADERS =
+GLUE_SOURCES =
+GLUE_HEADERS =
+O2CB_SOURCES =
+USER_SOURCES =
 
 EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/ocfs2
 
@@ -26,8 +30,6 @@ endif
 
 EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES -DOCFS2_ORACORE_WORKAROUNDS
 
-EXTRA_CFLAGS += -DOCFS2_CDSL
-
 EXTRA_CFLAGS += -DCONFIG_OCFS2_DEBUG_MASKLOG
 
 EXTRA_CFLAGS += -DCONFIG_OCFS2_FS_STATS
@@ -38,88 +40,37 @@ EXTRA_CFLAGS += -DCONFIG_OCFS2_FS_STATS
 #
 SAFE_SUBDIRS = cluster dlm
 
-SOURCES +=			\
-	acl.c			\
-	alloc.c 		\
-	aops.c 			\
-	blockcheck.c		\
-	buffer_head_io.c	\
-	dcache.c 		\
-	dir.c 			\
-	dlmglue.c 		\
-	export.c		\
-	extent_map.c 		\
-	file.c 			\
-	heartbeat.c 		\
-	inode.c 		\
-	ioctl.c			\
-	journal.c 		\
-	localalloc.c 		\
-	locks.c			\
-	mmap.c 			\
-	namei.c 		\
-	quota_global.c		\
-	quota_local.c		\
-	resize.c		\
-	slot_map.c 		\
-	stackglue.c		\
-	stack_o2cb.c		\
-	stack_user.c		\
-	suballoc.c 		\
-	super.c 		\
-	symlink.c 		\
-	sysfile.c 		\
-	uptodate.c		\
-	ver.c			\
-	xattr.c
-
-HEADERS += 			\
-	acl.h			\
-	alloc.h			\
-	aops.h			\
-	blockcheck.h		\
-	buffer_head_io.h	\
-	dcache.h		\
-	dir.h			\
-	dlmglue.h		\
-	export.h		\
-	extent_map.h		\
-	file.h			\
-	heartbeat.h		\
-	inode.h			\
-	ioctl.h			\
-	journal.h		\
-	localalloc.h		\
-	locks.h			\
-	mmap.h			\
-	namei.h			\
-	ocfs1_fs_compat.h	\
-	ocfs2_fs.h		\
-	ocfs2.h			\
-	ocfs2_lockid.h		\
-	ocfs2_lockingver.h	\
-	quota.h			\
-	resize.h		\
-	slot_map.h		\
-	stackglue.h		\
-	suballoc.h		\
-	super.h			\
-	symlink.h		\
-	sysfile.h		\
-	uptodate.h		\
-	ver.h			\
-	xattr.h
-
-OBJECTS = $(subst .c,.o,$(SOURCES))
-VERSION_FILES = $(SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+GLUE_SOURCES = stackglue.c
+GLUE_HEADERS = stackglue.h
+O2CB_SOURCES = stack_o2cb.c
+USER_SOURCES = stack_user.c
+
+FS_SOURCES += acl.c alloc.c aops.c blockcheck.c buffer_head_io.c dcache.c	\
+	dir.c dlmglue.c export.c extent_map.c file.c heartbeat.c inode.c	\
+	ioctl.c journal.c localalloc.c locks.c mmap.c namei.c quota_global.c	\
+	quota_local.c refcounttree.c resize.c slot_map.c suballoc.c super.c	\
+	symlink.c sysfile.c uptodate.c ver.c xattr.c
+
+FS_HEADERS += acl.h alloc.h aops.h blockcheck.h buffer_head_io.h dcache.h	\
+	dir.h dlmglue.h export.h extent_map.h file.h heartbeat.h inode.h	\
+	ioctl.h journal.h localalloc.h locks.h mmap.h namei.h ocfs1_fs_compat.h	\
+	ocfs2_fs.h ocfs2.h ocfs2_lockid.h ocfs2_lockingver.h quota.h		\
+	refcounttree.h resize.h slot_map.h suballoc.h super.h symlink.h		\
+	sysfile.h uptodate.h ver.h xattr.h
+
+FS_OBJECTS = $(subst .c,.o,$(FS_SOURCES))
+VERSION_FILES = $(FS_SOURCES) $(FS_HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
 VERSION_SRC = ver.c
 VERSION_PREFIX = OCFS2
 
 INSTALL_MOD_DIR := fs/ocfs2
 
-obj-m := ocfs2.o
+obj-m := ocfs2.o ocfs2_stackglue.o ocfs2_stack_o2cb.o ocfs2_stack_user.o
 
-ocfs2-objs := $(OBJECTS)
+ocfs2-objs := $(FS_OBJECTS)
+ocfs2_stackglue-objs := stackglue.o
+ocfs2_stack_o2cb-objs := stack_o2cb.o
+ocfs2_stack_user-objs := stack_user.o
 
 ifneq ($(KERNELRELEASE),)
 #
@@ -137,7 +88,9 @@ ifeq ($(KERNELRELEASE),)
 # Called from a regular "make". Just forward to kbuild.
 #
 
-DIST_FILES = $(SOURCES) $(HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS)
+DIST_FILES = $(FS_SOURCES) $(FS_HEADERS) $(COMPAT_SOURCES) $(COMPAT_HEADERS) \
+		$(GLUE_SOURCES) $(GLUE_HEADERS) $(O2CB_SOURCES) $(O2CB_HEADERS) \
+		$(USER_SOURCES) $(USER_HEADERS)
 
 ALL_RULES = stamp-md5 build-modules
 
-- 
1.5.6.5

[Ocfs2-devel] [PATCH 4/4] ocfs2: Fix version files

[Sunil Mushran]

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/cluster/ver.c  |    8 +++++---
 fs/ocfs2/dlm/dlmfsver.c |    7 ++++---
 fs/ocfs2/dlm/dlmver.c   |    7 ++++---
 fs/ocfs2/ver.c          |   12 +++++++++---
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/fs/ocfs2/cluster/ver.c b/fs/ocfs2/cluster/ver.c
index a56eee6..6ab31de 100644
--- a/fs/ocfs2/cluster/ver.c
+++ b/fs/ocfs2/cluster/ver.c
@@ -28,9 +28,9 @@
 
 #include "ver.h"
 
-#define CLUSTER_BUILD_VERSION "1.5.0"
-
-#define VERSION_STR "OCFS2 Node Manager " CLUSTER_BUILD_VERSION
+#define VERSION_STR "OCFS2 Node Manager " \
+	CLUSTER_BUILD_VERSION " " CLUSTER_BUILD_DATE \
+	" (build " CLUSTER_BUILD_MD5 ")"
 
 void cluster_print_version(void)
 {
@@ -39,4 +39,6 @@ void cluster_print_version(void)
 
 MODULE_DESCRIPTION(VERSION_STR);
 
+#ifdef MODULE_VERSION
 MODULE_VERSION(CLUSTER_BUILD_VERSION);
+#endif
diff --git a/fs/ocfs2/dlm/dlmfsver.c b/fs/ocfs2/dlm/dlmfsver.c
index a733b33..38872d0 100644
--- a/fs/ocfs2/dlm/dlmfsver.c
+++ b/fs/ocfs2/dlm/dlmfsver.c
@@ -28,9 +28,8 @@
 
 #include "dlmfsver.h"
 
-#define DLM_BUILD_VERSION "1.5.0"
-
-#define VERSION_STR "OCFS2 DLMFS " DLM_BUILD_VERSION
+#define VERSION_STR "OCFS2 DLMFS " \
+	DLM_BUILD_VERSION " " DLM_BUILD_DATE " (build " DLM_BUILD_MD5 ")"
 
 void dlmfs_print_version(void)
 {
@@ -39,4 +38,6 @@ void dlmfs_print_version(void)
 
 MODULE_DESCRIPTION(VERSION_STR);
 
+#ifdef MODULE_VERSION
 MODULE_VERSION(DLM_BUILD_VERSION);
+#endif
diff --git a/fs/ocfs2/dlm/dlmver.c b/fs/ocfs2/dlm/dlmver.c
index dfc0da4..71061b9 100644
--- a/fs/ocfs2/dlm/dlmver.c
+++ b/fs/ocfs2/dlm/dlmver.c
@@ -28,9 +28,8 @@
 
 #include "dlmver.h"
 
-#define DLM_BUILD_VERSION "1.5.0"
-
-#define VERSION_STR "OCFS2 DLM " DLM_BUILD_VERSION
+#define VERSION_STR "OCFS2 DLM " \
+	DLM_BUILD_VERSION " " DLM_BUILD_DATE " (build " DLM_BUILD_MD5 ")"
 
 void dlm_print_version(void)
 {
@@ -39,4 +38,6 @@ void dlm_print_version(void)
 
 MODULE_DESCRIPTION(VERSION_STR);
 
+#ifdef MODULE_VERSION
 MODULE_VERSION(DLM_BUILD_VERSION);
+#endif
diff --git a/fs/ocfs2/ver.c b/fs/ocfs2/ver.c
index e2488f4..f715770 100644
--- a/fs/ocfs2/ver.c
+++ b/fs/ocfs2/ver.c
@@ -29,15 +29,21 @@
 
 #include "ver.h"
 
-#define OCFS2_BUILD_VERSION "1.5.0"
-
-#define VERSION_STR "OCFS2 " OCFS2_BUILD_VERSION
+#define VERSION_STR "OCFS2 " \
+	OCFS2_BUILD_VERSION " " OCFS2_BUILD_DATE " (build " OCFS2_BUILD_MD5 ")"
 
 void ocfs2_print_version(void)
 {
 	printk(KERN_INFO "%s\n", VERSION_STR);
 }
 
+int ocfs2_str_version(char *buf)
+{
+	return sprintf(buf, "%s\n", VERSION_STR);
+}
+
 MODULE_DESCRIPTION(VERSION_STR);
 
+#ifdef MODULE_VERSION
 MODULE_VERSION(OCFS2_BUILD_VERSION);
+#endif
-- 
1.5.6.5

[Ocfs2-devel] Initial patches for ocfs2 1.6

[Joel Becker]

On Mon, Nov 09, 2009 at 04:08:53PM -0800, Sunil Mushran wrote:
> So the ocfs2 1.6 repository is up. It is a copy of the fs in the mainline.
> I have some 70-80 patches that will make it run atop el5 u4. The patches
> will be posted in smaller batches so as to make it easier to review.
> 
> The first set handles the makefiles, etc.

Ack.


-- 

"Not being known doesn't stop the truth from being true."
        - Richard Bach

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127