From: Anand Jain Date: Mon, 12 Jan 2015 16:55:10 +0000 (+0800) Subject: Btrfs: fix unused members in struct btrfs_root X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a835c9f678a0a1bf5280f8b7d9c9324e5aa2f60;p=linux Btrfs: fix unused members in struct btrfs_root There isn't any real use of following members of struct btrfs_root so delete them. struct kobject root_kobj; struct completion kobj_unregister; Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: Chris Mason (cherry picked from commit 78f55e5e1fa9f684705325667d455a957f43ad66) --- diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0c0860312153..a22d59bbc565 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1774,8 +1774,6 @@ struct btrfs_root { struct btrfs_fs_info *fs_info; struct extent_io_tree dirty_log_pages; - struct kobject root_kobj; - struct completion kobj_unregister; struct mutex objectid_mutex; spinlock_t accounting_lock; diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 6baf312f89b5..77f5ac1f62c3 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1276,12 +1276,10 @@ static void __setup_root(u32 nodesize, u32 sectorsize, u32 stripesize, memset(&root->root_key, 0, sizeof(root->root_key)); memset(&root->root_item, 0, sizeof(root->root_item)); memset(&root->defrag_progress, 0, sizeof(root->defrag_progress)); - memset(&root->root_kobj, 0, sizeof(root->root_kobj)); if (fs_info) root->defrag_trans_start = fs_info->generation; else root->defrag_trans_start = 0; - init_completion(&root->kobj_unregister); root->root_key.objectid = objectid; root->anon_dev = 0;