diff options
author | Anand Jain <Anand.Jain@oracle.com> | 2015-01-12 11:55:10 -0500 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-01-21 21:22:37 -0500 |
commit | 78f55e5e1fa9f684705325667d455a957f43ad66 (patch) | |
tree | f7336b54d9ec44ef71a776e86078d0c884e0c2d9 /fs/btrfs | |
parent | 0ee13fe28ce387864c0d2b1e8c52b64abe2fcd02 (diff) |
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 <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/ctree.h | 2 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 2ecdac0bd850..85c697d482c2 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -1798,8 +1798,6 @@ struct btrfs_root { | |||
1798 | struct btrfs_fs_info *fs_info; | 1798 | struct btrfs_fs_info *fs_info; |
1799 | struct extent_io_tree dirty_log_pages; | 1799 | struct extent_io_tree dirty_log_pages; |
1800 | 1800 | ||
1801 | struct kobject root_kobj; | ||
1802 | struct completion kobj_unregister; | ||
1803 | struct mutex objectid_mutex; | 1801 | struct mutex objectid_mutex; |
1804 | 1802 | ||
1805 | spinlock_t accounting_lock; | 1803 | spinlock_t accounting_lock; |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 0696a103751e..612d46eece62 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1275,12 +1275,10 @@ static void __setup_root(u32 nodesize, u32 sectorsize, u32 stripesize, | |||
1275 | memset(&root->root_key, 0, sizeof(root->root_key)); | 1275 | memset(&root->root_key, 0, sizeof(root->root_key)); |
1276 | memset(&root->root_item, 0, sizeof(root->root_item)); | 1276 | memset(&root->root_item, 0, sizeof(root->root_item)); |
1277 | memset(&root->defrag_progress, 0, sizeof(root->defrag_progress)); | 1277 | memset(&root->defrag_progress, 0, sizeof(root->defrag_progress)); |
1278 | memset(&root->root_kobj, 0, sizeof(root->root_kobj)); | ||
1279 | if (fs_info) | 1278 | if (fs_info) |
1280 | root->defrag_trans_start = fs_info->generation; | 1279 | root->defrag_trans_start = fs_info->generation; |
1281 | else | 1280 | else |
1282 | root->defrag_trans_start = 0; | 1281 | root->defrag_trans_start = 0; |
1283 | init_completion(&root->kobj_unregister); | ||
1284 | root->root_key.objectid = objectid; | 1282 | root->root_key.objectid = objectid; |
1285 | root->anon_dev = 0; | 1283 | root->anon_dev = 0; |
1286 | 1284 | ||