[Ocfs2-commits] zab commits r2101 - in trunk: . fs/configfs fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: zab
Signed-off-by: mfasheh
Date: 2005-04-01 17:32:39 -0600 (Fri, 01 Apr 2005)
New Revision: 2101

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/fs/configfs/Makefile
   trunk/fs/configfs/inode.c
   trunk/fs/ocfs2/dlm/Makefile
   trunk/fs/ocfs2/dlm/dlmfs.c
Log:
o recent -mm have a patch that replaced bdi.memory_backed with a .capabilities
  mask.  add some configure love and set either the mask or .memory_backed.

Signed-off-by: mfasheh


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-04-01 01:29:40 UTC (rev 2100)
+++ trunk/Config.make.in	2005-04-01 23:32:39 UTC (rev 2101)
@@ -64,6 +64,7 @@
 MISSING_SOCK_CREATE_LITE = @MISSING_SOCK_CREATE_LITE@
 JOURNAL_ACCESS_WITH_CREDITS = @JOURNAL_ACCESS_WITH_CREDITS@
 KIOCB_DTOR_IN_PRIVATE = @KIOCB_DTOR_IN_PRIVATE@
+BACKING_DEV_CAPABILITIES = @BACKING_DEV_CAPABILITIES@
 
 COMPAT_SAFE_WRITE = @COMPAT_SAFE_WRITE@
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-04-01 01:29:40 UTC (rev 2100)
+++ trunk/configure.in	2005-04-01 23:32:39 UTC (rev 2101)
@@ -370,6 +370,16 @@
 fi
 AC_SUBST(KIOCB_DTOR_IN_PRIVATE)
 
+BACKING_DEV_CAPABILITIES=
+AC_MSG_CHECKING([for cababilities mask in backing_dev_info])
+if grep "\<BDI_CAP_NO_WRITEBACK\>" "$KERNELINC/linux/backing-dev.h" >/dev/null 2>&1 ; then
+  AC_MSG_RESULT(yes)
+  BACKING_DEV_CAPABILITIES=yes
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST(BACKING_DEV_CAPABILITIES)
+
 # using -include has two advantages:
 #  the source doesn't need to know to include compat headers
 #  the compat header file names don't go through the search path

Modified: trunk/fs/configfs/Makefile
===================================================================
--- trunk/fs/configfs/Makefile	2005-04-01 01:29:40 UTC (rev 2100)
+++ trunk/fs/configfs/Makefile	2005-04-01 23:32:39 UTC (rev 2101)
@@ -11,6 +11,10 @@
 include $(OUR_TOPDIR)/Config.make
 endif
 
+ifdef BACKING_DEV_CAPABILITIES
+EXTRA_CFLAGS += -DBACKING_DEV_CAPABILITIES
+endif
+
 INSTALL_MOD_DIR := fs/configfs
 
 obj-m		:= configfs.o configfs_example.o bobtest.o

Modified: trunk/fs/configfs/inode.c
===================================================================
--- trunk/fs/configfs/inode.c	2005-04-01 01:29:40 UTC (rev 2100)
+++ trunk/fs/configfs/inode.c	2005-04-01 23:32:39 UTC (rev 2101)
@@ -45,7 +45,11 @@
 
 static struct backing_dev_info configfs_backing_dev_info = {
 	.ra_pages	= 0,	/* No readahead */
+#ifdef BACKING_DEV_CAPABILITIES
+	.capabilities	= BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_WRITEBACK,
+#else
 	.memory_backed	= 1,	/* Does not contribute to dirty memory */
+#endif
 };
 
 struct inode * configfs_new_inode(mode_t mode)

Modified: trunk/fs/ocfs2/dlm/Makefile
===================================================================
--- trunk/fs/ocfs2/dlm/Makefile	2005-04-01 01:29:40 UTC (rev 2100)
+++ trunk/fs/ocfs2/dlm/Makefile	2005-04-01 23:32:39 UTC (rev 2101)
@@ -18,6 +18,10 @@
 
 EXTRA_CFLAGS += -I$(CLUSTERINC) -I$(CONFIGFSINC)
 
+ifdef BACKING_DEV_CAPABILITIES
+EXTRA_CFLAGS += -DBACKING_DEV_CAPABILITIES
+endif
+
 ifneq ($(QUIET),1)
 EXTRA_CFLAGS += -DENABLE_DLMPRINTK
 endif

Modified: trunk/fs/ocfs2/dlm/dlmfs.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmfs.c	2005-04-01 01:29:40 UTC (rev 2100)
+++ trunk/fs/ocfs2/dlm/dlmfs.c	2005-04-01 23:32:39 UTC (rev 2101)
@@ -313,7 +313,11 @@
 
 static struct backing_dev_info dlmfs_backing_dev_info = {
 	.ra_pages	= 0,	/* No readahead */
+#ifdef BACKING_DEV_CAPABILITIES
+	.capabilities	= BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_WRITEBACK,
+#else
 	.memory_backed	= 1,	/* Does not contribute to dirty memory */
+#endif
 };
 
 static inline void dlmfs_set_backing_info(struct inode *inode)