From: Jan Kara <jack@suse.cz> To: <linux-fsdevel@vger.kernel.org> Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>, Tyler Hicks <tyhicks@canonical.com>, ecryptfs@vger.kernel.org Subject: [PATCH 11/25] ecryptfs: Convert to separately allocated bdi Date: Wed, 29 Mar 2017 12:56:09 +0200 [thread overview] Message-ID: <20170329105623.18241-12-jack@suse.cz> (raw) In-Reply-To: <20170329105623.18241-1-jack@suse.cz> 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> Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ecryptfs/ecryptfs_kernel.h | 1 - fs/ecryptfs/main.c | 4 +--- 2 files changed, 1 insertion(+), 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 { struct ecryptfs_sb_info { struct super_block *wsi_sb; struct ecryptfs_mount_crypt_stat mount_crypt_stat; - struct backing_dev_info bdi; }; /* 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 goto out; } - rc = bdi_setup_and_register(&sbi->bdi, "ecryptfs"); + rc = super_setup_bdi(s); if (rc) goto out1; ecryptfs_set_superblock_private(s, sbi); - s->s_bdi = &sbi->bdi; /* ->kill_sb() will take care of sbi after that point */ sbi = NULL; @@ -633,7 +632,6 @@ static void ecryptfs_kill_block_super(struct super_block *sb) if (!sb_info) return; ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat); - bdi_destroy(&sb_info->bdi); kmem_cache_free(ecryptfs_sb_info_cache, sb_info); } -- 2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: linux-fsdevel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>, Tyler Hicks <tyhicks@canonical.com>, ecryptfs@vger.kernel.org Subject: [PATCH 11/25] ecryptfs: Convert to separately allocated bdi Date: Wed, 29 Mar 2017 12:56:09 +0200 [thread overview] Message-ID: <20170329105623.18241-12-jack@suse.cz> (raw) In-Reply-To: <20170329105623.18241-1-jack@suse.cz> 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> Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ecryptfs/ecryptfs_kernel.h | 1 - fs/ecryptfs/main.c | 4 +--- 2 files changed, 1 insertion(+), 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 { struct ecryptfs_sb_info { struct super_block *wsi_sb; struct ecryptfs_mount_crypt_stat mount_crypt_stat; - struct backing_dev_info bdi; }; /* 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 goto out; } - rc = bdi_setup_and_register(&sbi->bdi, "ecryptfs"); + rc = super_setup_bdi(s); if (rc) goto out1; ecryptfs_set_superblock_private(s, sbi); - s->s_bdi = &sbi->bdi; /* ->kill_sb() will take care of sbi after that point */ sbi = NULL; @@ -633,7 +632,6 @@ static void ecryptfs_kill_block_super(struct super_block *sb) if (!sb_info) return; ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat); - bdi_destroy(&sb_info->bdi); kmem_cache_free(ecryptfs_sb_info_cache, sb_info); } -- 2.10.2
next prev parent reply other threads:[~2017-03-29 10:56 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-29 10:55 [PATCH 0/25 v2] fs: Convert all embedded bdis into separate ones Jan Kara 2017-03-29 10:55 ` [Cluster-devel] " Jan Kara 2017-03-29 10:55 ` [lustre-devel] " Jan Kara 2017-03-29 10:55 ` Jan Kara 2017-03-29 10:55 ` Jan Kara 2017-03-29 10:55 ` Jan Kara 2017-03-29 10:55 ` [PATCH 01/25] bdi: Provide bdi_register_va() and bdi_alloc() Jan Kara 2017-04-12 8:06 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 02/25] block: Unregister bdi on last reference drop Jan Kara 2017-04-12 8:06 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 03/25] bdi: Export bdi_alloc_node() and bdi_put() Jan Kara 2017-04-12 8:08 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 04/25] fs: Provide infrastructure for dynamic BDIs in filesystems Jan Kara 2017-03-29 10:56 ` [Cluster-devel] " Jan Kara 2017-03-29 10:56 ` [lustre-devel] " Jan Kara 2017-03-29 10:56 ` Jan Kara 2017-03-29 10:56 ` Jan Kara 2017-03-29 10:56 ` Jan Kara 2017-04-12 8:09 ` Christoph Hellwig 2017-04-12 8:09 ` [Cluster-devel] " Christoph Hellwig 2017-04-12 8:09 ` [lustre-devel] " Christoph Hellwig 2017-04-12 8:09 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 05/25] fs: Get proper reference for s_bdi Jan Kara 2017-04-12 8:09 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 06/25] lustre: Convert to separately allocated bdi Jan Kara 2017-03-29 10:56 ` [lustre-devel] " Jan Kara 2017-04-12 8:10 ` Christoph Hellwig 2017-04-12 8:10 ` [lustre-devel] " Christoph Hellwig 2017-03-29 10:56 ` [PATCH 07/25] 9p: " Jan Kara 2017-04-12 8:10 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 08/25] btrfs: " Jan Kara 2017-04-12 8:10 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 09/25] ceph: " Jan Kara 2017-03-29 10:56 ` Jan Kara 2017-04-12 8:11 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 10/25] cifs: " Jan Kara 2017-04-12 8:11 ` Christoph Hellwig 2017-03-29 10:56 ` Jan Kara [this message] 2017-03-29 10:56 ` [PATCH 11/25] ecryptfs: " Jan Kara 2017-04-12 8:11 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 12/25] afs: " Jan Kara 2017-04-12 8:12 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 13/25] mtd: Convert to dynamically allocated bdi infrastructure Jan Kara 2017-04-12 8:14 ` Christoph Hellwig 2017-04-12 9:43 ` Jan Kara 2017-03-29 10:56 ` [PATCH 14/25] coda: Convert to separately allocated bdi Jan Kara 2017-04-12 8:14 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 15/25] exofs: " Jan Kara 2017-04-12 8:14 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 16/25] fuse: " Jan Kara 2017-04-12 8:15 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 17/25] fuse: Get rid of bdi_initialized Jan Kara 2017-04-12 8:15 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 18/25] gfs2: Convert to properly refcounting bdi Jan Kara 2017-03-29 10:56 ` [Cluster-devel] " Jan Kara 2017-04-12 8:16 ` Christoph Hellwig 2017-04-12 8:16 ` [Cluster-devel] " Christoph Hellwig 2017-04-12 8:48 ` Steven Whitehouse 2017-04-12 8:48 ` [Cluster-devel] " Steven Whitehouse 2017-03-29 10:56 ` [PATCH 19/25] nilfs2: " Jan Kara 2017-03-29 10:56 ` Jan Kara 2017-04-12 8:17 ` Christoph Hellwig 2017-04-12 8:17 ` Christoph Hellwig 2017-04-12 9:33 ` Jan Kara 2017-03-29 10:56 ` [PATCH 20/25] ncpfs: Convert to separately allocated bdi Jan Kara 2017-04-12 8:18 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 21/25] nfs: " Jan Kara 2017-04-12 8:20 ` Christoph Hellwig 2017-04-12 9:52 ` Jan Kara 2017-03-29 10:56 ` [PATCH 22/25] ubifs: " Jan Kara 2017-04-12 8:20 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 23/25] fs: Remove SB_I_DYNBDI flag Jan Kara 2017-04-12 8:21 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 24/25] block: Remove unused functions Jan Kara 2017-04-12 8:21 ` Christoph Hellwig 2017-03-29 10:56 ` [PATCH 25/25] bdi: Drop 'parent' argument from bdi_register[_va]() Jan Kara 2017-04-12 8:21 ` Christoph Hellwig 2017-04-12 7:32 ` [PATCH 0/25 v2] fs: Convert all embedded bdis into separate ones Jan Kara 2017-04-12 10:24 [PATCH 0/25 v3] " Jan Kara 2017-04-12 10:24 ` [PATCH 11/25] ecryptfs: Convert to separately allocated bdi Jan Kara 2017-04-12 10:24 ` Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170329105623.18241-12-jack@suse.cz \ --to=jack@suse.cz \ --cc=ecryptfs@vger.kernel.org \ --cc=hch@infradead.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=tyhicks@canonical.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.