eCryptfs: make needlessly global symbols static

Andrew Morton wrote:
> Please check that all the newly-added global symbols do indeed need
> to be global.

Change symbols in keystore.c and crypto.o to static if they do not
need to be global.

Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 22 insertions, 21 deletions

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index a6cbfc16d8a4..09e2340ab783 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -39,7 +39,7 @@
  * determine the type of error, make appropriate log entries, and
  * return an error code.
  */
-int process_request_key_err(long err_code)
+static int process_request_key_err(long err_code)
 {
         int rc = 0;
 
@@ -396,6 +396,27 @@ out:
         return rc;
 }
 
+static int
+ecryptfs_get_auth_tok_sig(char **sig, struct ecryptfs_auth_tok *auth_tok)
+{
+        int rc = 0;
+
+        (*sig) = NULL;
+        switch (auth_tok->token_type) {
+        case ECRYPTFS_PASSWORD:
+                (*sig) = auth_tok->token.password.signature;
+                break;
+        case ECRYPTFS_PRIVATE_KEY:
+                (*sig) = auth_tok->token.private_key.signature;
+                break;
+        default:
+                printk(KERN_ERR "Cannot get sig for auth_tok of type [%d]\n",
+                       auth_tok->token_type);
+                rc = -EINVAL;
+        }
+        return rc;
+}
+
 /**
  * decrypt_pki_encrypted_session_key - Decrypt the session key with the given auth_tok.
  * @auth_tok: The key authentication token used to decrypt the session key
@@ -1082,26 +1103,6 @@ out:
         return rc;
 }
 
-int ecryptfs_get_auth_tok_sig(char **sig, struct ecryptfs_auth_tok *auth_tok)
-{
-        int rc = 0;
-
-        (*sig) = NULL;
-        switch (auth_tok->token_type) {
-        case ECRYPTFS_PASSWORD:
-                (*sig) = auth_tok->token.password.signature;
-                break;
-        case ECRYPTFS_PRIVATE_KEY:
-                (*sig) = auth_tok->token.private_key.signature;
-                break;
-        default:
-                printk(KERN_ERR "Cannot get sig for auth_tok of type [%d]\n",
-                       auth_tok->token_type);
-                rc = -EINVAL;
-        }
-        return rc;
-}
-
 /**
  * ecryptfs_parse_packet_set
  * @crypt_stat: The cryptographic context