[PATCH] add static in afs

The routine afs_rxvl_probe() is unused and could be removed.  (I only put
#if 0 around it.)

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index fc2c1a93653a59c4a16b7bd15b7f41ced1114e50..c476fde33fbc24ab64ed26137424e8eb7b7d776a 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -93,9 +93,10 @@ static int afs_inode_map_status(struct afs_vnode *vnode)
 
 /*****************************************************************************/
 /*
- * attempt to fetch the status of an inode, coelescing multiple simultaneous fetches
+ * attempt to fetch the status of an inode, coelescing multiple simultaneous
+ * fetches
  */
-int afs_inode_fetch_status(struct inode *inode)
+static int afs_inode_fetch_status(struct inode *inode)
 {
        struct afs_vnode *vnode;
        int ret;

diff --git a/fs/afs/vlclient.c b/fs/afs/vlclient.c
index 6a663cedd6348ff6de22640081ab22712e5b75c8..9e3631750e3ecedcc2240ffb52ef7b1ddcc1ac67 100644 (file)
--- a/fs/afs/vlclient.c
+++ b/fs/afs/vlclient.c
@@ -89,11 +89,12 @@ static void afs_rxvl_aemap(struct rxrpc_call *call)
        }
 } /* end afs_rxvl_aemap() */
 
+#if 0
 /*****************************************************************************/
 /*
- * probe a volume location server to see if it is still alive
+ * probe a volume location server to see if it is still alive -- unused
  */
-int afs_rxvl_probe(struct afs_server *server, int alloc_flags)
+static int afs_rxvl_probe(struct afs_server *server, int alloc_flags)
 {
        struct rxrpc_connection *conn;
        struct rxrpc_call *call;
@@ -173,6 +174,7 @@ int afs_rxvl_probe(struct afs_server *server, int alloc_flags)
        return ret;
 
 } /* end afs_rxvl_probe() */
+#endif
 
 /*****************************************************************************/
 /*

diff --git a/fs/afs/vlclient.h b/fs/afs/vlclient.h
index 65b0b6e52085277fcfaec489eecddff847ee7382..e3d601179c46646482059a6b6d09f317acd54039 100644 (file)
--- a/fs/afs/vlclient.h
+++ b/fs/afs/vlclient.h
@@ -71,9 +71,6 @@ struct afs_vldbentry {
 
 };
 
-/* probe a volume location server to see if it is still alive */
-extern int afs_rxvl_probe(struct afs_server *server, int alloc_flags);
-
 /* look up a volume location database entry by name */
 extern int afs_rxvl_get_entry_by_name(struct afs_server *server,
                                      const char *volname,

diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c
index c7396ca082ecaab4e4dd3fb2d8149c7d99aa15c5..5d650422e7fd57897257e1456efdcddf9f8e6ba3 100644 (file)
--- a/fs/afs/vlocation.c
+++ b/fs/afs/vlocation.c
@@ -29,6 +29,7 @@
 static void afs_vlocation_update_timer(struct afs_timer *timer);
 static void afs_vlocation_update_attend(struct afs_async_op *op);
 static void afs_vlocation_update_discard(struct afs_async_op *op);
+static void __afs_put_vlocation(struct afs_vlocation *vlocation);
 
 static void __afs_vlocation_timeout(struct afs_timer *timer)
 {
@@ -455,7 +456,7 @@ int afs_vlocation_lookup(struct afs_cell *cell,
  * finish using a volume location record
  * - caller must have cell->vol_sem write-locked
  */
-void __afs_put_vlocation(struct afs_vlocation *vlocation)
+static void __afs_put_vlocation(struct afs_vlocation *vlocation)
 {
        struct afs_cell *cell;
 

diff --git a/fs/afs/vnode.c b/fs/afs/vnode.c
index e3e9611cba51b237ab49bab9196c385b056586e9..9867fef3261d5982f0df5be03670f99c60dd5b66 100644 (file)
--- a/fs/afs/vnode.c
+++ b/fs/afs/vnode.c
@@ -86,9 +86,9 @@ static void afs_vnode_cb_timed_out(struct afs_timer *timer)
  * - starts callback expiry timer
  * - adds to server's callback list
  */
-void afs_vnode_finalise_status_update(struct afs_vnode *vnode,
-                                     struct afs_server *server,
-                                     int ret)
+static void afs_vnode_finalise_status_update(struct afs_vnode *vnode,
+                                            struct afs_server *server,
+                                            int ret)
 {
        struct afs_server *oldserver = NULL;
 

diff --git a/fs/afs/volume.h b/fs/afs/volume.h
index bbe4634648480f6d279df7a8f8c8e98d50eaf378..1e691889c4c96911bc036f7b7539184b4ccc10fb 100644 (file)
--- a/fs/afs/volume.h
+++ b/fs/afs/volume.h
@@ -99,7 +99,6 @@ extern int afs_vlocation_lookup(struct afs_cell *cell,
 
 #define afs_get_vlocation(V) do { atomic_inc(&(V)->usage); } while(0)
 
-extern void __afs_put_vlocation(struct afs_vlocation *vlocation);
 extern void afs_put_vlocation(struct afs_vlocation *vlocation);
 extern void afs_vlocation_do_timeout(struct afs_vlocation *vlocation);