[Ocfs2-commits] mfasheh commits r2434 - in trunk: . fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-06-27 15:29:08 -0500 (Mon, 27 Jun 2005)
New Revision: 2434

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/fs/ocfs2/Makefile
   trunk/fs/ocfs2/inode.c
Log:
* Remove the generic_drop_inode workaround - this is a broken workaround
  anyway so we should just let those kernels fail the build.

Signed-off-by: manish



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-06-27 18:42:46 UTC (rev 2433)
+++ trunk/Config.make.in	2005-06-27 20:29:08 UTC (rev 2434)
@@ -51,7 +51,6 @@
 EXTRA_CFLAGS += @KAPI_COMPAT_CFLAGS@
 
 MISSING_SOCK_CREATE_LITE = @MISSING_SOCK_CREATE_LITE@
-MISSING_GENERIC_DROP_INODE = @MISSING_GENERIC_DROP_INODE@
 JOURNAL_ACCESS_WITH_CREDITS = @JOURNAL_ACCESS_WITH_CREDITS@
 BACKING_DEV_CAPABILITIES = @BACKING_DEV_CAPABILITIES@
 IDR_GET_NEW_RETURNS_ID = @IDR_GET_NEW_RETURNS_ID@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-06-27 18:42:46 UTC (rev 2433)
+++ trunk/configure.in	2005-06-27 20:29:08 UTC (rev 2434)
@@ -212,10 +212,6 @@
 OCFS2_CHECK_KERNEL(sock_create_lite, net.h,, MISSING_SOCK_CREATE_LITE=yes)
 AC_SUBST(MISSING_SOCK_CREATE_LITE)
 
-MISSING_GENERIC_DROP_INODE=
-OCFS2_CHECK_KERNEL(generic_drop_inode, fs.h,, MISSING_GENERIC_DROP_INODE=yes)
-AC_SUBST(MISSING_GENERIC_DROP_INODE)
-
 OCFS2_KERNEL_COMPAT(assert_spin_locked, spinlock.h)
 
 OCFS2_CHECK_KERNEL([kref_init with release callback], kref.h,

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-06-27 18:42:46 UTC (rev 2433)
+++ trunk/fs/ocfs2/Makefile	2005-06-27 20:29:08 UTC (rev 2434)
@@ -26,10 +26,6 @@
 EXTRA_CFLAGS += -DJOURNAL_ACCESS_WITH_CREDITS
 endif
 
-ifdef MISSING_GENERIC_DROP_INODE
-EXTRA_CFLAGS += -DMISSING_GENERIC_DROP_INODE
-endif
-
 #
 # Since SUBDIRS means something to kbuild, define them safely.  Do not
 # include trailing slashes.

Modified: trunk/fs/ocfs2/inode.c
===================================================================
--- trunk/fs/ocfs2/inode.c	2005-06-27 18:42:46 UTC (rev 2433)
+++ trunk/fs/ocfs2/inode.c	2005-06-27 20:29:08 UTC (rev 2434)
@@ -788,26 +788,6 @@
 	mlog_exit_void();
 }
 
-#ifdef MISSING_GENERIC_DROP_INODE
-/* This is *only* a hack for kernels which don't have
- * generic_drop_inode exported yet. */
-static void generic_drop_inode(struct inode *inode)
-{
-	struct ocfs2_inode_info *oi = OCFS2_I(inode);
-
-	if (inode->i_nlink) {
-		/* Nasty, nasty we have i_nlink, but since we can't
-		 * get to generic_forget_inode, we are forced to call
-		 * generic_delete_inode but want to tell
-		 * ocfs2_delete_inode to skip the deletion path. */
-		spin_lock(&oi->ip_lock);
-		oi->ip_flags |= OCFS2_INODE_SKIP_DELETE;
-		spin_unlock(&oi->ip_lock);
-	}
-	generic_delete_inode(inode);
-}
-#endif
-
 /* Called under inode_lock, with no more references on the
  * struct inode, so it's safe here to check the flags field
  * and to manipulate i_nlink without any other locks. */