diff options
Diffstat (limited to 'convert')
| -rw-r--r-- | convert/common.c | 2 | ||||
| -rw-r--r-- | convert/main.c | 12 | ||||
| -rw-r--r-- | convert/source-fs.h | 2 | ||||
| -rw-r--r-- | convert/source-reiserfs.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/convert/common.c b/convert/common.c index 6ddf4a46..b7674297 100644 --- a/convert/common.c +++ b/convert/common.c @@ -76,7 +76,7 @@ static inline int write_temp_super(int fd, struct btrfs_super_block *sb, } /* - * Setup temporary superblock at cfg->super_bynter + * Setup temporary superblock at cfg->super_bytenr * Needed info are extracted from cfg, and root_bytenr, chunk_bytenr * * For now sys chunk array will be empty and dev_item is empty too. diff --git a/convert/main.c b/convert/main.c index 5ebc4482..68f76f71 100644 --- a/convert/main.c +++ b/convert/main.c @@ -66,7 +66,7 @@ * c. Doesn't cover any data chunks in 1.1 * * 2) Create basic btrfs filesystem structure - * Initial metadata and sys chunks are inserted in the first availabe + * Initial metadata and sys chunks are inserted in the first available * space found in step 1.3 * Then insert all data chunks into the basic btrfs * @@ -682,7 +682,7 @@ static int calculate_available_space(struct btrfs_convert_context *cctx) cur_off = 0; /* * Calculate free space - * Always round up the start bytenr, to avoid metadata extent corss + * Always round up the start bytenr, to avoid metadata extent cross * stripe boundary, as later mkfs_convert() won't have all the extent * allocation check */ @@ -724,7 +724,7 @@ out: /* * Read used space, and since we have the used space, - * calcuate data_chunks and free for later mkfs + * calculate data_chunks and free for later mkfs */ static int convert_read_used_space(struct btrfs_convert_context *cctx) { @@ -975,7 +975,7 @@ static int init_btrfs(struct btrfs_mkfs_config *cfg, struct btrfs_root *root, /* * Don't alloc any metadata/system chunk, as we don't want - * any meta/sys chunk allcated before all data chunks are inserted. + * any meta/sys chunk allocated before all data chunks are inserted. * Or we screw up the chunk layout just like the old implement. */ fs_info->avoid_sys_chunk_alloc = 1; @@ -1344,7 +1344,7 @@ static bool is_chunk_direct_mapped(struct btrfs_fs_info *fs_info, u64 start) if (map->num_stripes != 1) goto out; - /* Chunk's logical doesn't match with phisical, not 1:1 mapped */ + /* Chunk's logical doesn't match with physical, not 1:1 mapped */ if (map->ce.start != map->stripes[0].physical) goto out; ret = true; @@ -1356,7 +1356,7 @@ out: * Iterate all file extents of the convert image. * * All file extents except ones in btrfs_reserved_ranges must be mapped 1:1 - * on disk. (Means thier file_offset must match their on disk bytenr) + * on disk. (Means their file_offset must match their on disk bytenr) * * File extents in reserved ranges can be relocated to other place, and in * that case we will read them out for later use. diff --git a/convert/source-fs.h b/convert/source-fs.h index f5314aff..7cf587d9 100644 --- a/convert/source-fs.h +++ b/convert/source-fs.h @@ -26,7 +26,7 @@ #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID /* - * Reresents a simple contiguous range. + * Represents a simple contiguous range. * * For multiple or non-contiguous ranges, use extent_cache_tree from * extent-cache.c diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c index 7a70cadd..cc592f19 100644 --- a/convert/source-reiserfs.c +++ b/convert/source-reiserfs.c @@ -301,7 +301,7 @@ static int reiserfs_record_indirect_extent(reiserfs_filsys_t fs, u64 position, /* * Unlike btrfs inline extents, reiserfs can have multiple inline extents. - * This handles concatanating multiple tails into one inline extent + * This handles concatenating multiple tails into one inline extent * for insertion. */ static int reiserfs_record_direct_extent(reiserfs_filsys_t fs, __u64 position, @@ -564,7 +564,7 @@ static int reiserfs_copy_meta(reiserfs_filsys_t fs, struct btrfs_root *root, }; /* The root directory's dirid in reiserfs points to an object - * that does't exist. In btrfs it's self-referential. + * that doens't exist. In btrfs it's self-referential. */ if (deh_dirid == REISERFS_ROOT_PARENT_OBJECTID) parent = objectid; |