[Ocfs2-commits] mfasheh commits r1725 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-12-28 19:13:56 -0600 (Tue, 28 Dec 2004)
New Revision: 1725

Modified:
   trunk/src/Makefile
   trunk/src/dcache.c
   trunk/src/file.c
   trunk/src/file.h
   trunk/src/namei.c
Log:
* get rid of the PURE_EVIL junk.



Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-12-29 01:04:23 UTC (rev 1724)
+++ trunk/src/Makefile	2004-12-29 01:13:56 UTC (rev 1725)
@@ -23,7 +23,6 @@
 
 GLOBAL_DEFINES = 
 GLOBAL_DEFINES += -DCATCH_BH_JBD_RACES
-#GLOBAL_DEFINES += -DPURE_EVIL
 
 ifdef OCFS_DEBUG
 GLOBAL_DEFINES += -DDEBUG

Modified: trunk/src/dcache.c
===================================================================
--- trunk/src/dcache.c	2004-12-29 01:04:23 UTC (rev 1724)
+++ trunk/src/dcache.c	2004-12-29 01:13:56 UTC (rev 1725)
@@ -58,12 +58,6 @@
 
 	osb = OCFS_SB(inode->i_sb);
 
-#ifdef PURE_EVIL
-	if (evil_filename_check(EVIL_DENTRY, dentry)) {
-		LOG_ERROR_ARGS("EVIL REVALIDATE: flags=%d\n", flags);
-	}
-#endif
-
 	OCFS_ASSERT(osb);
 
 	if (inode == osb->root_inode) {

Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-12-29 01:04:23 UTC (rev 1724)
+++ trunk/src/file.c	2004-12-29 01:13:56 UTC (rev 1725)
@@ -158,12 +158,6 @@
 	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", file, dentry, datasync,
 			dentry->d_name.len, dentry->d_name.name);
 
-#ifdef PURE_EVIL
-	if (evil_filename_check(EVIL_DENTRY, dentry)) {
-		LOG_ERROR_ARGS("EVIL SYNC_FILE: mode=%d\n", file->f_flags);
-	}
-#endif
-
 	err = ocfs_sync_inode(dentry->d_inode);
 	if (err)
 		goto bail;
@@ -178,38 +172,6 @@
 	return (err < 0) ? -EIO : 0;
 }				/* ocfs_sync_file */
 
-
-#ifdef PURE_EVIL
-int evil_filename_check(int type, void *ptr)
-{
-	struct file *filp = ptr;
-	struct dentry *dentry = ptr;
-	struct inode *inode = ptr;
-	struct page *page = ptr;
-	struct list_head *iter, *temp_iter;
-
-	switch (type) {
-		case EVIL_FILE:
-			dentry = filp ? filp->f_dentry : NULL;
-		case EVIL_DENTRY:
-			return evil_dentry_check(dentry);
-		
-		case EVIL_PAGE:	
-			inode = page ? (page->mapping ? page->mapping->host : NULL) : NULL;
-		case EVIL_INODE:
-			if (inode && S_ISREG(inode->i_mode)) {
-				list_for_each_safe (iter, temp_iter, &(inode->i_dentry)) {
-					dentry = list_entry (iter, struct dentry, d_alias);
-					if (evil_dentry_check(dentry))
-						return 1;
-				}
-			}
-			return 0;
-	}
-	return 0;
-}
-#endif
-
 /*
  * ocfs_file_write()
  * Linux 2.6 TODO: Remove all O_DIRECT conditionals here, they are no longer

Modified: trunk/src/file.h
===================================================================
--- trunk/src/file.h	2004-12-29 01:04:23 UTC (rev 1724)
+++ trunk/src/file.h	2004-12-29 01:13:56 UTC (rev 1725)
@@ -59,24 +59,4 @@
 			struct buffer_head *fe_bh,
 			u64 new_i_size);
 
-#ifdef PURE_EVIL
-#define EVIL_FILENAME        "libctx10.a"
-#define EVIL_FILENAME_LEN    10
-enum {
-	EVIL_FILE,
-	EVIL_INODE,
-	EVIL_DENTRY,
-	EVIL_PAGE
-};
-
-static inline int evil_dentry_check(struct dentry *dentry)
-{
-	return (dentry != NULL && dentry->d_name.len == EVIL_FILENAME_LEN && 
-	    	strncmp(dentry->d_name.name, EVIL_FILENAME, EVIL_FILENAME_LEN) == 0);
-}
-
-int evil_filename_check(int type, void *ptr);
-#endif /* PURE_EVIL */
-
-
 #endif /* OCFS2_FILE_H */

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-12-29 01:04:23 UTC (rev 1724)
+++ trunk/src/namei.c	2004-12-29 01:13:56 UTC (rev 1725)
@@ -279,14 +279,6 @@
 	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, %lu, '%*s')\n", dir, dentry, mode,
 			(unsigned long)dev, dentry->d_name.len, dentry->d_name.name);
 
-#ifdef PURE_EVIL
-	if (evil_filename_check(EVIL_DENTRY, dentry)) {
-		LOG_ERROR_ARGS("EVIL MKNOD... creating the file here!\n");
-		LOG_ERROR_ARGS ("(0x%p, 0x%p, %d, %lu, '%*s')\n", dir, dentry, mode,
-			(unsigned long)dev, dentry->d_name.len, dentry->d_name.name);
-	}
-#endif
-
 	/* get our super block */
 	osb = OCFS_SB(dir->i_sb);
 
@@ -506,12 +498,6 @@
 	fe = (ocfs2_dinode *) (*new_fe_bh)->b_data;
 	memset(fe, 0, osb->sb->s_blocksize);
 	inode->i_ino = ino_from_blkno(osb->sb, fe_blkno);
-	
-#ifdef PURE_EVIL
-	if (evil_filename_check(EVIL_DENTRY, dentry)) {
-		LOG_ERROR_ARGS("EVIL MKNOD_LOCKED: i_ino to watch is %lu\n", inode->i_ino);
-	}
-#endif
 
 	spin_lock(&osb->s_next_gen_lock);
 	inode->i_generation = osb->s_next_generation++;