[Ocfs2-commits] manish commits r2076 - trunk/fs/ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Mar 29 23:58:44 CST 2005
Author: manish
Signed-off-by: mfasheh
Date: 2005-03-29 23:58:42 -0600 (Tue, 29 Mar 2005)
New Revision: 2076
Modified:
trunk/fs/ocfs2/alloc.c
trunk/fs/ocfs2/aops.c
trunk/fs/ocfs2/buffer_head_io.c
trunk/fs/ocfs2/dlmglue.c
trunk/fs/ocfs2/file.c
trunk/fs/ocfs2/heartbeat.c
trunk/fs/ocfs2/inode.c
trunk/fs/ocfs2/journal.c
trunk/fs/ocfs2/journal.h
trunk/fs/ocfs2/localalloc.c
trunk/fs/ocfs2/namei.c
trunk/fs/ocfs2/suballoc.c
trunk/fs/ocfs2/super.c
trunk/fs/ocfs2/symlink.c
trunk/fs/ocfs2/sysfile.c
trunk/fs/ocfs2/vote.c
Log:
ocfs_commit_thread doesn't need to be public. reorder and remove redundant
journal.h includes
Signed-off-by: mfasheh
Modified: trunk/fs/ocfs2/alloc.c
===================================================================
--- trunk/fs/ocfs2/alloc.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/alloc.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -38,12 +38,12 @@
#include "dlmglue.h"
#include "extent_map.h"
#include "inode.h"
+#include "journal.h"
#include "localalloc.h"
#include "suballoc.h"
#include "sysfile.h"
#include "file.h"
-#include "journal.h"
#include "buffer_head_io.h"
/* Tracing */
Modified: trunk/fs/ocfs2/aops.c
===================================================================
--- trunk/fs/ocfs2/aops.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/aops.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -35,11 +35,10 @@
#include "extent_map.h"
#include "file.h"
#include "inode.h"
+#include "journal.h"
#include "symlink.h"
-#include "journal.h"
-
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_INODE
static int ocfs_symlink_get_block(struct inode *inode, sector_t iblock,
Modified: trunk/fs/ocfs2/buffer_head_io.c
===================================================================
--- trunk/fs/ocfs2/buffer_head_io.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/buffer_head_io.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -35,8 +35,8 @@
#include "ocfs2.h"
#include "alloc.h"
+#include "journal.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_IO
Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/dlmglue.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -48,10 +48,10 @@
#include "extent_map.h"
#include "heartbeat.h"
#include "inode.h"
+#include "journal.h"
#include "slot_map.h"
#include "vote.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_DLMGLUE
Modified: trunk/fs/ocfs2/file.c
===================================================================
--- trunk/fs/ocfs2/file.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/file.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -46,10 +46,10 @@
#include "file.h"
#include "sysfile.h"
#include "inode.h"
+#include "journal.h"
#include "mmap.h"
#include "suballoc.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_FILE
Modified: trunk/fs/ocfs2/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/heartbeat.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/heartbeat.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -41,8 +41,8 @@
#include "alloc.h"
#include "heartbeat.h"
+#include "journal.h"
-#include "journal.h"
#include "buffer_head_io.h"
/* Tracing */
Modified: trunk/fs/ocfs2/inode.c
===================================================================
--- trunk/fs/ocfs2/inode.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/inode.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -43,6 +43,7 @@
#include "extent_map.h"
#include "file.h"
#include "inode.h"
+#include "journal.h"
#include "namei.h"
#include "suballoc.h"
#include "super.h"
@@ -50,7 +51,6 @@
#include "sysfile.h"
#include "vote.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_INODE
Modified: trunk/fs/ocfs2/journal.c
===================================================================
--- trunk/fs/ocfs2/journal.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/journal.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -48,7 +48,6 @@
#include "vote.h"
#include "sysfile.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_JOURNAL
@@ -70,6 +69,7 @@
int dirty);
static int ocfs2_trylock_journal(ocfs_super *osb,
int slot_num);
+static int ocfs_commit_thread(void *arg);
/*
* ocfs_commit_cache()
@@ -1582,7 +1582,7 @@
goto retry;
}
-int ocfs_commit_thread(void *arg)
+static int ocfs_commit_thread(void *arg)
{
int status;
ocfs_super *osb = arg;
Modified: trunk/fs/ocfs2/journal.h
===================================================================
--- trunk/fs/ocfs2/journal.h 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/journal.h 2005-03-30 05:58:42 UTC (rev 2076)
@@ -178,7 +178,7 @@
/* Exported only for the journal struct init code in super.c. Do not call. */
void ocfs2_complete_recovery(void *data);
-int ocfs_commit_thread(void *arg);
+/* Needed to complete mount recovery */
int ocfs_recover_orphans(ocfs_super *osb);
/*
Modified: trunk/fs/ocfs2/localalloc.c
===================================================================
--- trunk/fs/ocfs2/localalloc.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/localalloc.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -39,11 +39,11 @@
#include "alloc.h"
#include "dlmglue.h"
+#include "journal.h"
#include "localalloc.h"
#include "suballoc.h"
#include "sysfile.h"
-#include "journal.h"
#include "buffer_head_io.h"
/* The largest cluster size where we even consider using local alloc. */
Modified: trunk/fs/ocfs2/namei.c
===================================================================
--- trunk/fs/ocfs2/namei.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/namei.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -53,14 +53,14 @@
#include "dlmglue.h"
#include "extent_map.h"
#include "file.h"
-#include "sysfile.h"
#include "inode.h"
+#include "journal.h"
#include "namei.h"
#include "suballoc.h"
#include "symlink.h"
+#include "sysfile.h"
#include "vote.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_NAMEI
Modified: trunk/fs/ocfs2/suballoc.c
===================================================================
--- trunk/fs/ocfs2/suballoc.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/suballoc.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -37,11 +37,11 @@
#include "alloc.h"
#include "dlmglue.h"
+#include "journal.h"
#include "localalloc.h"
#include "suballoc.h"
#include "sysfile.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_CHAINALLOC
Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/super.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -66,7 +66,6 @@
#include "ver.h"
#include "vote.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_SUPER
Modified: trunk/fs/ocfs2/symlink.c
===================================================================
--- trunk/fs/ocfs2/symlink.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/symlink.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -47,9 +47,9 @@
#include "alloc.h"
#include "file.h"
#include "inode.h"
+#include "journal.h"
#include "symlink.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_SYMLINK
Modified: trunk/fs/ocfs2/sysfile.c
===================================================================
--- trunk/fs/ocfs2/sysfile.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/sysfile.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -37,9 +37,9 @@
#include "alloc.h"
#include "dir.h"
#include "inode.h"
+#include "journal.h"
#include "sysfile.h"
-#include "journal.h"
#include "buffer_head_io.h"
/* Tracing */
Modified: trunk/fs/ocfs2/vote.c
===================================================================
--- trunk/fs/ocfs2/vote.c 2005-03-30 04:54:32 UTC (rev 2075)
+++ trunk/fs/ocfs2/vote.c 2005-03-30 05:58:42 UTC (rev 2076)
@@ -46,10 +46,10 @@
#include "extent_map.h"
#include "heartbeat.h"
#include "inode.h"
+#include "journal.h"
#include "slot_map.h"
#include "vote.h"
-#include "journal.h"
#include "buffer_head_io.h"
#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_VOTE
More information about the Ocfs2-commits
mailing list