ext4 crypto: migrate into vfs's crypto engine

[mirror_ubuntu-artful-kernel.git] / fs / ext4 / dir.c

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 561d7308b393a0347dea3b1344f409bf5fed0139..67415e0e6af065890e427f061d717f90db91755e 100644 (file)
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -109,10 +109,10 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
        struct super_block *sb = inode->i_sb;
        struct buffer_head *bh = NULL;
        int dir_has_error = 0;
-       struct ext4_str fname_crypto_str = {.name = NULL, .len = 0};
+       struct fscrypt_str fstr = FSTR_INIT(NULL, 0);
 
        if (ext4_encrypted_inode(inode)) {
-               err = ext4_get_encryption_info(inode);
+               err = fscrypt_get_encryption_info(inode);
                if (err && err != -ENOKEY)
                        return err;
        }
@@ -139,8 +139,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
        }
 
        if (ext4_encrypted_inode(inode)) {
-               err = ext4_fname_crypto_alloc_buffer(inode, EXT4_NAME_LEN,
-                                                    &fname_crypto_str);
+               err = fscrypt_fname_alloc_buffer(inode, EXT4_NAME_LEN, &fstr);
                if (err < 0)
                        return err;
        }
@@ -150,6 +149,11 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
        while (ctx->pos < inode->i_size) {
                struct ext4_map_blocks map;
 
+               if (fatal_signal_pending(current)) {
+                       err = -ERESTARTSYS;
+                       goto errout;
+               }
+               cond_resched();
                map.m_lblk = ctx->pos >> EXT4_BLOCK_SIZE_BITS(sb);
                map.m_len = 1;
                err = ext4_map_blocks(NULL, inode, &map, 0);
@@ -248,16 +252,19 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
                                            get_dtype(sb, de->file_type)))
                                                goto done;
                                } else {
-                                       int save_len = fname_crypto_str.len;
+                                       int save_len = fstr.len;
+                                       struct fscrypt_str de_name =
+                                                       FSTR_INIT(de->name,
+                                                               de->name_len);
 
                                        /* Directory is encrypted */
-                                       err = ext4_fname_disk_to_usr(inode,
-                                               NULL, de, &fname_crypto_str);
-                                       fname_crypto_str.len = save_len;
+                                       err = fscrypt_fname_disk_to_usr(inode,
+                                               0, 0, &de_name, &fstr);
+                                       fstr.len = save_len;
                                        if (err < 0)
                                                goto errout;
                                        if (!dir_emit(ctx,
-                                           fname_crypto_str.name, err,
+                                           fstr.name, err,
                                            le32_to_cpu(de->inode),
                                            get_dtype(sb, de->file_type)))
                                                goto done;
@@ -266,7 +273,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
                        ctx->pos += ext4_rec_len_from_disk(de->rec_len,
                                                sb->s_blocksize);
                }
-               if ((ctx->pos < inode->i_size) && !dir_relax(inode))
+               if ((ctx->pos < inode->i_size) && !dir_relax_shared(inode))
                        goto done;
                brelse(bh);
                bh = NULL;
@@ -276,7 +283,7 @@ done:
        err = 0;
 errout:
 #ifdef CONFIG_EXT4_FS_ENCRYPTION
-       ext4_fname_crypto_free_buffer(&fname_crypto_str);
+       fscrypt_fname_free_buffer(&fstr);
 #endif
        brelse(bh);
        return err;
@@ -427,7 +434,7 @@ void ext4_htree_free_dir_info(struct dir_private_info *p)
 int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,
                             __u32 minor_hash,
                            struct ext4_dir_entry_2 *dirent,
-                           struct ext4_str *ent_name)
+                           struct fscrypt_str *ent_name)
 {
        struct rb_node **p, *parent = NULL;
        struct fname *fname, *new_fn;
@@ -604,7 +611,7 @@ finished:
 static int ext4_dir_open(struct inode * inode, struct file * filp)
 {
        if (ext4_encrypted_inode(inode))
-               return ext4_get_encryption_info(inode) ? -EACCES : 0;
+               return fscrypt_get_encryption_info(inode) ? -EACCES : 0;
        return 0;
 }
 
@@ -644,7 +651,7 @@ int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf,
 const struct file_operations ext4_dir_operations = {
        .llseek         = ext4_dir_llseek,
        .read           = generic_read_dir,
-       .iterate        = ext4_readdir,
+       .iterate_shared = ext4_readdir,
        .unlocked_ioctl = ext4_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = ext4_compat_ioctl,