diff options
-rw-r--r-- | fs/btrfs/check-integrity.c | 2 | ||||
-rw-r--r-- | fs/btrfs/ctree.h | 10 | ||||
-rw-r--r-- | fs/btrfs/dev-replace.c | 2 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 2 | ||||
-rw-r--r-- | fs/btrfs/extent-tree.c | 2 | ||||
-rw-r--r-- | fs/btrfs/extent_map.c | 4 | ||||
-rw-r--r-- | fs/btrfs/file.c | 2 | ||||
-rw-r--r-- | fs/btrfs/ordered-data.c | 2 | ||||
-rw-r--r-- | fs/btrfs/tree-log.c | 2 | ||||
-rw-r--r-- | fs/btrfs/volumes.c | 4 |
10 files changed, 16 insertions, 16 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 9d226b5d6358..e34a71b3e225 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c | |||
@@ -178,7 +178,7 @@ struct btrfsic_block { | |||
178 | * Elements of this type are allocated dynamically and required because | 178 | * Elements of this type are allocated dynamically and required because |
179 | * each block object can refer to and can be ref from multiple blocks. | 179 | * each block object can refer to and can be ref from multiple blocks. |
180 | * The key to lookup them in the hashtable is the dev_bytenr of | 180 | * The key to lookup them in the hashtable is the dev_bytenr of |
181 | * the block ref to plus the one from the block refered from. | 181 | * the block ref to plus the one from the block referred from. |
182 | * The fact that they are searchable via a hashtable and that a | 182 | * The fact that they are searchable via a hashtable and that a |
183 | * ref_cnt is maintained is not required for the btrfs integrity | 183 | * ref_cnt is maintained is not required for the btrfs integrity |
184 | * check algorithm itself, it is only used to make the output more | 184 | * check algorithm itself, it is only used to make the output more |
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0ef28fd2bd27..84a6a5b3384a 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -788,7 +788,7 @@ struct btrfs_root_item { | |||
788 | 788 | ||
789 | /* | 789 | /* |
790 | * This generation number is used to test if the new fields are valid | 790 | * This generation number is used to test if the new fields are valid |
791 | * and up to date while reading the root item. Everytime the root item | 791 | * and up to date while reading the root item. Every time the root item |
792 | * is written out, the "generation" field is copied into this field. If | 792 | * is written out, the "generation" field is copied into this field. If |
793 | * anyone ever mounted the fs with an older kernel, we will have | 793 | * anyone ever mounted the fs with an older kernel, we will have |
794 | * mismatching generation values here and thus must invalidate the | 794 | * mismatching generation values here and thus must invalidate the |
@@ -1219,10 +1219,10 @@ struct btrfs_space_info { | |||
1219 | * we've called update_block_group and dropped the bytes_used counter | 1219 | * we've called update_block_group and dropped the bytes_used counter |
1220 | * and increased the bytes_pinned counter. However this means that | 1220 | * and increased the bytes_pinned counter. However this means that |
1221 | * bytes_pinned does not reflect the bytes that will be pinned once the | 1221 | * bytes_pinned does not reflect the bytes that will be pinned once the |
1222 | * delayed refs are flushed, so this counter is inc'ed everytime we call | 1222 | * delayed refs are flushed, so this counter is inc'ed every time we |
1223 | * btrfs_free_extent so it is a realtime count of what will be freed | 1223 | * call btrfs_free_extent so it is a realtime count of what will be |
1224 | * once the transaction is committed. It will be zero'ed everytime the | 1224 | * freed once the transaction is committed. It will be zero'ed every |
1225 | * transaction commits. | 1225 | * time the transaction commits. |
1226 | */ | 1226 | */ |
1227 | struct percpu_counter total_bytes_pinned; | 1227 | struct percpu_counter total_bytes_pinned; |
1228 | 1228 | ||
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index ff2db7a6c894..a1d6652e0c47 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -858,7 +858,7 @@ int btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace) | |||
858 | * not called and the the filesystem is remounted | 858 | * not called and the the filesystem is remounted |
859 | * in degraded state. This does not stop the | 859 | * in degraded state. This does not stop the |
860 | * dev_replace procedure. It needs to be canceled | 860 | * dev_replace procedure. It needs to be canceled |
861 | * manually if the cancelation is wanted. | 861 | * manually if the cancellation is wanted. |
862 | */ | 862 | */ |
863 | break; | 863 | break; |
864 | } | 864 | } |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 53525a54608b..c95e3ce9f22e 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -816,7 +816,7 @@ static void run_one_async_done(struct btrfs_work *work) | |||
816 | waitqueue_active(&fs_info->async_submit_wait)) | 816 | waitqueue_active(&fs_info->async_submit_wait)) |
817 | wake_up(&fs_info->async_submit_wait); | 817 | wake_up(&fs_info->async_submit_wait); |
818 | 818 | ||
819 | /* If an error occured we just want to clean up the bio and move on */ | 819 | /* If an error occurred we just want to clean up the bio and move on */ |
820 | if (async->error) { | 820 | if (async->error) { |
821 | async->bio->bi_error = async->error; | 821 | async->bio->bi_error = async->error; |
822 | bio_endio(async->bio); | 822 | bio_endio(async->bio); |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 083783b53536..53e12977bfd0 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -5758,7 +5758,7 @@ out_fail: | |||
5758 | 5758 | ||
5759 | /* | 5759 | /* |
5760 | * This is tricky, but first we need to figure out how much we | 5760 | * This is tricky, but first we need to figure out how much we |
5761 | * free'd from any free-ers that occured during this | 5761 | * free'd from any free-ers that occurred during this |
5762 | * reservation, so we reset ->csum_bytes to the csum_bytes | 5762 | * reservation, so we reset ->csum_bytes to the csum_bytes |
5763 | * before we dropped our lock, and then call the free for the | 5763 | * before we dropped our lock, and then call the free for the |
5764 | * number of bytes that were freed while we were trying our | 5764 | * number of bytes that were freed while we were trying our |
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index cca21ff6553b..318b048eb254 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
@@ -62,7 +62,7 @@ struct extent_map *alloc_extent_map(void) | |||
62 | 62 | ||
63 | /** | 63 | /** |
64 | * free_extent_map - drop reference count of an extent_map | 64 | * free_extent_map - drop reference count of an extent_map |
65 | * @em: extent map beeing releasead | 65 | * @em: extent map being releasead |
66 | * | 66 | * |
67 | * Drops the reference out on @em by one and free the structure | 67 | * Drops the reference out on @em by one and free the structure |
68 | * if the reference count hits zero. | 68 | * if the reference count hits zero. |
@@ -422,7 +422,7 @@ struct extent_map *search_extent_mapping(struct extent_map_tree *tree, | |||
422 | /** | 422 | /** |
423 | * remove_extent_mapping - removes an extent_map from the extent tree | 423 | * remove_extent_mapping - removes an extent_map from the extent tree |
424 | * @tree: extent tree to remove from | 424 | * @tree: extent tree to remove from |
425 | * @em: extent map beeing removed | 425 | * @em: extent map being removed |
426 | * | 426 | * |
427 | * Removes @em from @tree. No reference counts are dropped, and no checks | 427 | * Removes @em from @tree. No reference counts are dropped, and no checks |
428 | * are done to see if the range is in use | 428 | * are done to see if the range is in use |
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index dba5de6cdc8a..15a09cb156ce 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -1847,7 +1847,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, | |||
1847 | /* | 1847 | /* |
1848 | * We also have to set last_sub_trans to the current log transid, | 1848 | * We also have to set last_sub_trans to the current log transid, |
1849 | * otherwise subsequent syncs to a file that's been synced in this | 1849 | * otherwise subsequent syncs to a file that's been synced in this |
1850 | * transaction will appear to have already occured. | 1850 | * transaction will appear to have already occurred. |
1851 | */ | 1851 | */ |
1852 | spin_lock(&BTRFS_I(inode)->lock); | 1852 | spin_lock(&BTRFS_I(inode)->lock); |
1853 | BTRFS_I(inode)->last_sub_trans = root->log_transid; | 1853 | BTRFS_I(inode)->last_sub_trans = root->log_transid; |
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 86e1688c13b2..0de7da5a610d 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c | |||
@@ -1010,7 +1010,7 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset, | |||
1010 | for (; node; node = rb_prev(node)) { | 1010 | for (; node; node = rb_prev(node)) { |
1011 | test = rb_entry(node, struct btrfs_ordered_extent, rb_node); | 1011 | test = rb_entry(node, struct btrfs_ordered_extent, rb_node); |
1012 | 1012 | ||
1013 | /* We treat this entry as if it doesnt exist */ | 1013 | /* We treat this entry as if it doesn't exist */ |
1014 | if (test_bit(BTRFS_ORDERED_UPDATED_ISIZE, &test->flags)) | 1014 | if (test_bit(BTRFS_ORDERED_UPDATED_ISIZE, &test->flags)) |
1015 | continue; | 1015 | continue; |
1016 | if (test->file_offset + test->len <= disk_i_size) | 1016 | if (test->file_offset + test->len <= disk_i_size) |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index eafdb965c206..24d03c751149 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -1046,7 +1046,7 @@ again: | |||
1046 | 1046 | ||
1047 | /* | 1047 | /* |
1048 | * NOTE: we have searched root tree and checked the | 1048 | * NOTE: we have searched root tree and checked the |
1049 | * coresponding ref, it does not need to check again. | 1049 | * corresponding ref, it does not need to check again. |
1050 | */ | 1050 | */ |
1051 | *search_done = 1; | 1051 | *search_done = 1; |
1052 | } | 1052 | } |
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 80857b4646c0..e2b54d546b7c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -2749,7 +2749,7 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, | |||
2749 | em->start + em->len < chunk_offset) { | 2749 | em->start + em->len < chunk_offset) { |
2750 | /* | 2750 | /* |
2751 | * This is a logic error, but we don't want to just rely on the | 2751 | * This is a logic error, but we don't want to just rely on the |
2752 | * user having built with ASSERT enabled, so if ASSERT doens't | 2752 | * user having built with ASSERT enabled, so if ASSERT doesn't |
2753 | * do anything we still error out. | 2753 | * do anything we still error out. |
2754 | */ | 2754 | */ |
2755 | ASSERT(0); | 2755 | ASSERT(0); |
@@ -4119,7 +4119,7 @@ out: | |||
4119 | * Callback for btrfs_uuid_tree_iterate(). | 4119 | * Callback for btrfs_uuid_tree_iterate(). |
4120 | * returns: | 4120 | * returns: |
4121 | * 0 check succeeded, the entry is not outdated. | 4121 | * 0 check succeeded, the entry is not outdated. |
4122 | * < 0 if an error occured. | 4122 | * < 0 if an error occurred. |
4123 | * > 0 if the check failed, which means the caller shall remove the entry. | 4123 | * > 0 if the check failed, which means the caller shall remove the entry. |
4124 | */ | 4124 | */ |
4125 | static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info, | 4125 | static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info, |