diff options
author | Byongho Lee <bhlee.kernel@gmail.com> | 2015-07-10 00:10:26 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-08-09 10:34:27 -0400 |
commit | a4027a20c57a2c8779e17a61425737634bb7163d (patch) | |
tree | 4e65c171448f013eddcdad3075b06608f0fc24f9 | |
parent | 4a770891d9ddf94df985ca438e78d355b8469247 (diff) |
Btrfs: remove unused mutex from struct 'btrfs_fs_info'
The code using 'ordered_extent_flush_mutex' mutex has removed by below
commit.
- 8d875f95da43c6a8f18f77869f2ef26e9594fecc
btrfs: disable strict file flushes for renames and truncates
But the mutex still lives in struct 'btrfs_fs_info'.
So, this patch removes the mutex from struct 'btrfs_fs_info' and its
initialization code.
Signed-off-by: Byongho Lee <bhlee.kernel@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r-- | fs/btrfs/ctree.h | 6 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index f335c18bd263..d4042c89d29b 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -1518,12 +1518,6 @@ struct btrfs_fs_info { | |||
1518 | */ | 1518 | */ |
1519 | struct mutex ordered_operations_mutex; | 1519 | struct mutex ordered_operations_mutex; |
1520 | 1520 | ||
1521 | /* | ||
1522 | * Same as ordered_operations_mutex except this is for ordered extents | ||
1523 | * and not the operations. | ||
1524 | */ | ||
1525 | struct mutex ordered_extent_flush_mutex; | ||
1526 | |||
1527 | struct rw_semaphore commit_root_sem; | 1521 | struct rw_semaphore commit_root_sem; |
1528 | 1522 | ||
1529 | struct rw_semaphore cleanup_work_sem; | 1523 | struct rw_semaphore cleanup_work_sem; |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e49ae5ea9040..f7536bcf7cee 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -2608,7 +2608,6 @@ int open_ctree(struct super_block *sb, | |||
2608 | 2608 | ||
2609 | 2609 | ||
2610 | mutex_init(&fs_info->ordered_operations_mutex); | 2610 | mutex_init(&fs_info->ordered_operations_mutex); |
2611 | mutex_init(&fs_info->ordered_extent_flush_mutex); | ||
2612 | mutex_init(&fs_info->tree_log_mutex); | 2611 | mutex_init(&fs_info->tree_log_mutex); |
2613 | mutex_init(&fs_info->chunk_mutex); | 2612 | mutex_init(&fs_info->chunk_mutex); |
2614 | mutex_init(&fs_info->transaction_kthread_mutex); | 2613 | mutex_init(&fs_info->transaction_kthread_mutex); |