diff options
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 05dc3c17cb62..3611df2ce5c1 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -125,8 +125,8 @@ struct async_submit_bio { | |||
125 | * Different roots are used for different purposes and may nest inside each | 125 | * Different roots are used for different purposes and may nest inside each |
126 | * other and they require separate keysets. As lockdep keys should be | 126 | * other and they require separate keysets. As lockdep keys should be |
127 | * static, assign keysets according to the purpose of the root as indicated | 127 | * static, assign keysets according to the purpose of the root as indicated |
128 | * by btrfs_root->objectid. This ensures that all special purpose roots | 128 | * by btrfs_root->root_key.objectid. This ensures that all special purpose |
129 | * have separate keysets. | 129 | * roots have separate keysets. |
130 | * | 130 | * |
131 | * Lock-nesting across peer nodes is always done with the immediate parent | 131 | * Lock-nesting across peer nodes is always done with the immediate parent |
132 | * node locked thus preventing deadlock. As lockdep doesn't know this, use | 132 | * node locked thus preventing deadlock. As lockdep doesn't know this, use |
@@ -1148,7 +1148,6 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info, | |||
1148 | root->state = 0; | 1148 | root->state = 0; |
1149 | root->orphan_cleanup_state = 0; | 1149 | root->orphan_cleanup_state = 0; |
1150 | 1150 | ||
1151 | root->objectid = objectid; | ||
1152 | root->last_trans = 0; | 1151 | root->last_trans = 0; |
1153 | root->highest_objectid = 0; | 1152 | root->highest_objectid = 0; |
1154 | root->nr_delalloc_inodes = 0; | 1153 | root->nr_delalloc_inodes = 0; |