fscrypt: rename fscrypt_info => fscrypt_inode_info

[linux-2.6-microblaze.git] / fs / crypto / keysetup.c

diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c
index 608599f..094d1b7 100644 (file)
--- a/fs/crypto/keysetup.c
+++ b/fs/crypto/keysetup.c
@@ -148,7 +148,7 @@ err_free_tfm:
  * and IV generation method (@ci->ci_policy.flags).
  */
 int fscrypt_prepare_key(struct fscrypt_prepared_key *prep_key,
-                       const u8 *raw_key, const struct fscrypt_info *ci)
+                       const u8 *raw_key, const struct fscrypt_inode_info *ci)
 {
        struct crypto_skcipher *tfm;
 
@@ -178,13 +178,14 @@ void fscrypt_destroy_prepared_key(struct super_block *sb,
 }
 
 /* Given a per-file encryption key, set up the file's crypto transform object */
-int fscrypt_set_per_file_enc_key(struct fscrypt_info *ci, const u8 *raw_key)
+int fscrypt_set_per_file_enc_key(struct fscrypt_inode_info *ci,
+                                const u8 *raw_key)
 {
        ci->ci_owns_key = true;
        return fscrypt_prepare_key(&ci->ci_enc_key, raw_key, ci);
 }
 
-static int setup_per_mode_enc_key(struct fscrypt_info *ci,
+static int setup_per_mode_enc_key(struct fscrypt_inode_info *ci,
                                  struct fscrypt_master_key *mk,
                                  struct fscrypt_prepared_key *keys,
                                  u8 hkdf_context, bool include_fs_uuid)
@@ -265,7 +266,7 @@ static int fscrypt_derive_siphash_key(const struct fscrypt_master_key *mk,
        return 0;
 }
 
-int fscrypt_derive_dirhash_key(struct fscrypt_info *ci,
+int fscrypt_derive_dirhash_key(struct fscrypt_inode_info *ci,
                               const struct fscrypt_master_key *mk)
 {
        int err;
@@ -279,7 +280,7 @@ int fscrypt_derive_dirhash_key(struct fscrypt_info *ci,
        return 0;
 }
 
-void fscrypt_hash_inode_number(struct fscrypt_info *ci,
+void fscrypt_hash_inode_number(struct fscrypt_inode_info *ci,
                               const struct fscrypt_master_key *mk)
 {
        WARN_ON_ONCE(ci->ci_inode->i_ino == 0);
@@ -289,7 +290,7 @@ void fscrypt_hash_inode_number(struct fscrypt_info *ci,
                                              &mk->mk_ino_hash_key);
 }
 
-static int fscrypt_setup_iv_ino_lblk_32_key(struct fscrypt_info *ci,
+static int fscrypt_setup_iv_ino_lblk_32_key(struct fscrypt_inode_info *ci,
                                            struct fscrypt_master_key *mk)
 {
        int err;
@@ -329,7 +330,7 @@ unlock:
        return 0;
 }
 
-static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci,
+static int fscrypt_setup_v2_file_key(struct fscrypt_inode_info *ci,
                                     struct fscrypt_master_key *mk,
                                     bool need_dirhash_key)
 {
@@ -404,7 +405,7 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci,
  * still allow 512-bit master keys if the user chooses to use them, though.)
  */
 static bool fscrypt_valid_master_key_size(const struct fscrypt_master_key *mk,
-                                         const struct fscrypt_info *ci)
+                                         const struct fscrypt_inode_info *ci)
 {
        unsigned int min_keysize;
 
@@ -430,11 +431,12 @@ static bool fscrypt_valid_master_key_size(const struct fscrypt_master_key *mk,
  *
  * If the master key is found in the filesystem-level keyring, then it is
  * returned in *mk_ret with its semaphore read-locked.  This is needed to ensure
- * that only one task links the fscrypt_info into ->mk_decrypted_inodes (as
- * multiple tasks may race to create an fscrypt_info for the same inode), and to
- * synchronize the master key being removed with a new inode starting to use it.
+ * that only one task links the fscrypt_inode_info into ->mk_decrypted_inodes
+ * (as multiple tasks may race to create an fscrypt_inode_info for the same
+ * inode), and to synchronize the master key being removed with a new inode
+ * starting to use it.
  */
-static int setup_file_encryption_key(struct fscrypt_info *ci,
+static int setup_file_encryption_key(struct fscrypt_inode_info *ci,
                                     bool need_dirhash_key,
                                     struct fscrypt_master_key **mk_ret)
 {
@@ -519,7 +521,7 @@ out_release_key:
        return err;
 }
 
-static void put_crypt_info(struct fscrypt_info *ci)
+static void put_crypt_info(struct fscrypt_inode_info *ci)
 {
        struct fscrypt_master_key *mk;
 
@@ -546,7 +548,7 @@ static void put_crypt_info(struct fscrypt_info *ci)
                fscrypt_put_master_key_activeref(ci->ci_inode->i_sb, mk);
        }
        memzero_explicit(ci, sizeof(*ci));
-       kmem_cache_free(fscrypt_info_cachep, ci);
+       kmem_cache_free(fscrypt_inode_info_cachep, ci);
 }
 
 static int
@@ -555,7 +557,7 @@ fscrypt_setup_encryption_info(struct inode *inode,
                              const u8 nonce[FSCRYPT_FILE_NONCE_SIZE],
                              bool need_dirhash_key)
 {
-       struct fscrypt_info *crypt_info;
+       struct fscrypt_inode_info *crypt_info;
        struct fscrypt_mode *mode;
        struct fscrypt_master_key *mk = NULL;
        int res;
@@ -564,7 +566,7 @@ fscrypt_setup_encryption_info(struct inode *inode,
        if (res)
                return res;
 
-       crypt_info = kmem_cache_zalloc(fscrypt_info_cachep, GFP_KERNEL);
+       crypt_info = kmem_cache_zalloc(fscrypt_inode_info_cachep, GFP_KERNEL);
        if (!crypt_info)
                return -ENOMEM;
 
@@ -592,8 +594,8 @@ fscrypt_setup_encryption_info(struct inode *inode,
        /*
         * For existing inodes, multiple tasks may race to set ->i_crypt_info.
         * So use cmpxchg_release().  This pairs with the smp_load_acquire() in
-        * fscrypt_get_info().  I.e., here we publish ->i_crypt_info with a
-        * RELEASE barrier so that other tasks can ACQUIRE it.
+        * fscrypt_get_inode_info().  I.e., here we publish ->i_crypt_info with
+        * a RELEASE barrier so that other tasks can ACQUIRE it.
         */
        if (cmpxchg_release(&inode->i_crypt_info, NULL, crypt_info) == NULL) {
                /*
@@ -740,8 +742,8 @@ EXPORT_SYMBOL_GPL(fscrypt_prepare_new_inode);
  * fscrypt_put_encryption_info() - free most of an inode's fscrypt data
  * @inode: an inode being evicted
  *
- * Free the inode's fscrypt_info.  Filesystems must call this when the inode is
- * being evicted.  An RCU grace period need not have elapsed yet.
+ * Free the inode's fscrypt_inode_info.  Filesystems must call this when the
+ * inode is being evicted.  An RCU grace period need not have elapsed yet.
  */
 void fscrypt_put_encryption_info(struct inode *inode)
 {
@@ -778,7 +780,7 @@ EXPORT_SYMBOL(fscrypt_free_inode);
  */
 int fscrypt_drop_inode(struct inode *inode)
 {
-       const struct fscrypt_info *ci = fscrypt_get_info(inode);
+       const struct fscrypt_inode_info *ci = fscrypt_get_inode_info(inode);
 
        /*
         * If ci is NULL, then the inode doesn't have an encryption key set up