[Ocfs2-commits] manish commits r2440 - in trunk/fs/ocfs2: . cluster

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Date: 2005-06-27 20:03:13 -0500 (Mon, 27 Jun 2005)
New Revision: 2440

Modified:
   trunk/fs/ocfs2/cluster/net_proc.c
   trunk/fs/ocfs2/cluster/tcp.c
   trunk/fs/ocfs2/inode.c
   trunk/fs/ocfs2/inode.h
   trunk/fs/ocfs2/namei.h
   trunk/fs/ocfs2/super.c
Log:
Cleanups for things found by sparse

Signed-off-by: mfasheh


Modified: trunk/fs/ocfs2/cluster/net_proc.c
===================================================================
--- trunk/fs/ocfs2/cluster/net_proc.c	2005-06-28 00:19:44 UTC (rev 2439)
+++ trunk/fs/ocfs2/cluster/net_proc.c	2005-06-28 01:03:13 UTC (rev 2440)
@@ -53,7 +53,7 @@
 	spin_unlock(&o2net_proc_lock);
 }
 
-struct o2net_send_tracking *next_nst(struct o2net_send_tracking *nst_start)
+static struct o2net_send_tracking *next_nst(struct o2net_send_tracking *nst_start)
 {
 	struct o2net_send_tracking *nst, *ret = NULL;
 
@@ -206,7 +206,7 @@
 	spin_unlock(&o2net_proc_lock);
 }
 
-struct o2net_sock_container *next_sc(struct o2net_sock_container *sc_start)
+static struct o2net_sock_container *next_sc(struct o2net_sock_container *sc_start)
 {
 	struct o2net_sock_container *sc, *ret = NULL;
 

Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c	2005-06-28 00:19:44 UTC (rev 2439)
+++ trunk/fs/ocfs2/cluster/tcp.c	2005-06-28 01:03:13 UTC (rev 2440)
@@ -1227,7 +1227,7 @@
 	sc_put(sc);
 }
 
-int o2net_set_options(struct socket *sock)
+static int o2net_set_options(struct socket *sock)
 {
 	int ret, i;
 	mm_segment_t oldfs;

Modified: trunk/fs/ocfs2/inode.c
===================================================================
--- trunk/fs/ocfs2/inode.c	2005-06-28 00:19:44 UTC (rev 2439)
+++ trunk/fs/ocfs2/inode.c	2005-06-28 01:03:13 UTC (rev 2440)
@@ -53,8 +53,6 @@
 
 #include "buffer_head_io.h"
 
-extern struct address_space_operations ocfs2_aops;
-
 #define OCFS2_FI_FLAG_NOWAIT	0x1
 struct ocfs2_find_inode_args
 {

Modified: trunk/fs/ocfs2/inode.h
===================================================================
--- trunk/fs/ocfs2/inode.h	2005-06-28 00:19:44 UTC (rev 2439)
+++ trunk/fs/ocfs2/inode.h	2005-06-28 01:03:13 UTC (rev 2440)
@@ -114,6 +114,8 @@
 
 extern kmem_cache_t *ocfs2_inode_cache;
 
+extern struct address_space_operations ocfs2_aops;
+
 struct buffer_head *ocfs2_bread(struct inode *inode, int block,
 				int *err, int reada);
 void ocfs2_clear_inode(struct inode *inode);

Modified: trunk/fs/ocfs2/namei.h
===================================================================
--- trunk/fs/ocfs2/namei.h	2005-06-28 00:19:44 UTC (rev 2439)
+++ trunk/fs/ocfs2/namei.h	2005-06-28 01:03:13 UTC (rev 2440)
@@ -28,6 +28,8 @@
 
 extern struct inode_operations ocfs2_dir_iops;
 
+struct dentry *ocfs2_get_parent(struct dentry *child);
+
 int ocfs2_check_dir_entry (struct inode *dir,
 			   struct ocfs2_dir_entry *de,
 			   struct buffer_head *bh,
@@ -41,6 +43,7 @@
 		     struct inode *orphan_dir_inode,
 		     struct inode *inode,
 		     struct buffer_head *orphan_dir_bh);
+
 static inline int ocfs2_match(int len,
 			      const char * const name,
 			      struct ocfs2_dir_entry *de)

Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c	2005-06-28 00:19:44 UTC (rev 2439)
+++ trunk/fs/ocfs2/super.c	2005-06-28 01:03:13 UTC (rev 2440)
@@ -56,6 +56,7 @@
 #include "inode.h"
 #include "journal.h"
 #include "localalloc.h"
+#include "namei.h"
 #include "proc.h"
 #include "slot_map.h"
 #include "super.h"
@@ -73,8 +74,10 @@
 
 static u32 osb_id;             /* Keeps track of next available OSB Id */
 
+static kmem_cache_t *ocfs2_inode_cachep = NULL;
+
 kmem_cache_t *ocfs2_lock_cache = NULL;
-kmem_cache_t *ocfs2_inode_cachep = NULL;
+
 /* OCFS2 needs to schedule several differnt types of work which
  * require cluster locking, disk I/O, recovery waits, etc. Since these
  * types of work tend to be heavy we avoid using the kernel events
@@ -127,7 +130,6 @@
 	.put_super	= ocfs2_put_super,
 };
 
-struct dentry *ocfs2_get_parent(struct dentry *child);
 static struct export_operations ocfs2_export_ops = {
 	.get_parent	= ocfs2_get_parent,
 };