aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h1
-rw-r--r--fs/ecryptfs/main.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 95c1c8d34539..9c351bf757b2 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -349,7 +349,6 @@ struct ecryptfs_mount_crypt_stat {
349struct ecryptfs_sb_info { 349struct ecryptfs_sb_info {
350 struct super_block *wsi_sb; 350 struct super_block *wsi_sb;
351 struct ecryptfs_mount_crypt_stat mount_crypt_stat; 351 struct ecryptfs_mount_crypt_stat mount_crypt_stat;
352 struct backing_dev_info bdi;
353}; 352};
354 353
355/* file private data. */ 354/* file private data. */
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