aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/main.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2017-04-12 06:24:35 -0400
committerJens Axboe <axboe@fb.com>2017-04-20 14:09:55 -0400
commite836818bd9ec580b65d1970e588f9ba892a88f5c (patch)
treea95ac17641ed2a39bb07aec64bdb1081acf5b3bd /fs/ecryptfs/main.c
parent851ea0860986961f32774e34753ad80e5fd545a1 (diff)
ecryptfs: Convert to separately allocated bdi
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>
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r--fs/ecryptfs/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 151872dcc1f4..9014479d0160 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -519,12 +519,11 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
519 goto out; 519 goto out;
520 } 520 }
521 521
522 rc = bdi_setup_and_register(&sbi->bdi, "ecryptfs"); 522 rc = super_setup_bdi(s);
523 if (rc) 523 if (rc)
524 goto out1; 524 goto out1;
525 525
526 ecryptfs_set_superblock_private(s, sbi); 526 ecryptfs_set_superblock_private(s, sbi);
527 s->s_bdi = &sbi->bdi;
528 527
529 /* ->kill_sb() will take care of sbi after that point */ 528 /* ->kill_sb() will take care of sbi after that point */
530 sbi = NULL; 529 sbi = NULL;
@@ -633,7 +632,6 @@ static void ecryptfs_kill_block_super(struct super_block *sb)
633 if (!sb_info) 632 if (!sb_info)
634 return; 633 return;
635 ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat); 634 ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat);
636 bdi_destroy(&sb_info->bdi);
637 kmem_cache_free(ecryptfs_sb_info_cache, sb_info); 635 kmem_cache_free(ecryptfs_sb_info_cache, sb_info);
638} 636}
639 637