[Ocfs2-commits] smushran commits r2788 - in branches/ocfs2-1.2: fs/ocfs2 vendor/rhel4 vendor/sles9

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: jlbec
Date: 2006-03-21 18:15:09 -0600 (Tue, 21 Mar 2006)
New Revision: 2788

Modified:
   branches/ocfs2-1.2/fs/ocfs2/Makefile
   branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
   branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
Log:
sles9 and rhel4 spec files updated
to handle differences in generic_delete_inode() in both distros
vis-a-vis truncate_inode_pages()
Signed-off-by: jlbec

Modified: branches/ocfs2-1.2/fs/ocfs2/Makefile
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/Makefile	2006-03-18 01:02:05 UTC (rev 2787)
+++ branches/ocfs2-1.2/fs/ocfs2/Makefile	2006-03-22 00:15:09 UTC (rev 2788)
@@ -35,7 +35,10 @@
 EXTRA_CFLAGS += -I$(OUR_TOPDIR)/fs/debugfs/include
 endif
 
+ifndef GENERIC_DELETE_INODE_NOT_TRUNCATES
 EXTRA_CFLAGS += -DOCFS2_DELETE_INODE_WORKAROUND
+endif
+
 EXTRA_CFLAGS += -DOCFS2_CDSL
 
 #

Modified: branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2006-03-18 01:02:05 UTC (rev 2787)
+++ branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2006-03-22 00:15:09 UTC (rev 2788)
@@ -127,7 +127,7 @@
 %if %{buildup}
 local_configure "%{kver}"
 
-make QUIET=1
+make V=0
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -147,7 +147,7 @@
 %if %{buildsmp}
 local_configure "%{kver}smp"
 
-make QUIET=1
+make V=0
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -167,7 +167,7 @@
 %if %{buildhugemem}
 local_configure "%{kver}hugemem"
 
-make QUIET=1
+make V=0
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely

Modified: branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2006-03-18 01:02:05 UTC (rev 2787)
+++ branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2006-03-22 00:15:09 UTC (rev 2788)
@@ -288,7 +288,7 @@
 
 %if %{builddefault}
 local_configure "%{kver}-default"
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -311,7 +311,7 @@
 %if %{buildsmp}
 local_configure "%{kver}-smp"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -334,7 +334,7 @@
 %if %{buildbigsmp}
 local_configure "%{kver}-bigsmp"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -357,7 +357,7 @@
 %if %{build64kpagesize}
 local_configure "%{kver}-64k-pagesize"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -380,7 +380,7 @@
 %if %{buildsn2}
 local_configure "%{kver}-sn2"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -403,7 +403,7 @@
 %if %{buildiseries64}
 local_configure "%{kver}-iseries64"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -426,7 +426,7 @@
 %if %{buildpmac64}
 local_configure "%{kver}-pmac64"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -449,7 +449,7 @@
 %if %{buildpseries64}
 local_configure "%{kver}-pseries64"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -472,7 +472,7 @@
 %if %{builds390}
 local_configure "%{kver}-s390"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -495,7 +495,7 @@
 %if %{builds390x}
 local_configure "%{kver}-s390x"
 
-make QUIET=1
+make V=0 GENERIC_DELETE_INODE_NOT_TRUNCATES=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely