iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ecryptfs: Convert to separately allocated bdi

Browse Source 
Allocate struct backing_dev_info separately instead of embedding it
inside the superblock. This unifies handling of bdi among users.

CC: Tyler Hicks <tyhicks@canonical.com>
CC: ecryptfs@vger.kernel.org
Acked-by: Tyler Hicks <tyhicks@canonical.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Jan Kara 2017-04-12 12:24:35 +02:00 committed by Jens Axboe
parent 851ea08609
commit e836818bd9
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ecryptfs/ecryptfs_kernel.h
View File

@ -349,7 +349,6 @@ struct ecryptfs_mount_crypt_stat {
struct ecryptfs_sb_info { struct ecryptfs_sb_info {
struct super_block *wsi_sb; struct super_block *wsi_sb;
struct ecryptfs_mount_crypt_stat mount_crypt_stat; struct ecryptfs_mount_crypt_stat mount_crypt_stat;
struct backing_dev_info bdi;
}; };
/* file private data. */ /* file private data. */

4
fs/ecryptfs/main.c
View File

@ -519,12 +519,11 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
goto out; goto out;
} }
rc = bdi_setup_and_register(&sbi->bdi, "ecryptfs"); rc = super_setup_bdi(s);
if (rc) if (rc)
goto out1; goto out1;
ecryptfs_set_superblock_private(s, sbi); ecryptfs_set_superblock_private(s, sbi);
s->s_bdi = &sbi->bdi;
/* ->kill_sb() will take care of sbi after that point */ /* ->kill_sb() will take care of sbi after that point */
sbi = NULL; sbi = NULL;
@ -633,7 +632,6 @@ static void ecryptfs_kill_block_super(struct super_block *sb)
if (!sb_info) if (!sb_info)
return; return;
ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat); ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat);
bdi_destroy(&sb_info->bdi);
kmem_cache_free(ecryptfs_sb_info_cache, sb_info); kmem_cache_free(ecryptfs_sb_info_cache, sb_info);
} }