diff options
Diffstat (limited to 'mkfs')
| -rw-r--r-- | mkfs/common.c | 2 | ||||
| -rw-r--r-- | mkfs/common.h | 4 | ||||
| -rw-r--r-- | mkfs/main.c | 2 | ||||
| -rw-r--r-- | mkfs/rootdir.c | 11 |
4 files changed, 10 insertions, 9 deletions
diff --git a/mkfs/common.c b/mkfs/common.c index 3a80050c..0ace262b 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -514,7 +514,7 @@ u64 btrfs_min_dev_size(u32 nodesize, int mixed, u64 meta_profile, * * Temporary chunks sizes are always fixed: * One initial sys chunk, one SINGLE meta, and one SINGLE data. - * The latter two are all 8M, accroding to @calc_size of + * The latter two are all 8M, according to @calc_size of * btrfs_alloc_chunk(). */ reserved += BTRFS_BLOCK_RESERVED_1M_FOR_SUPER + diff --git a/mkfs/common.h b/mkfs/common.h index f6b60c28..28912906 100644 --- a/mkfs/common.h +++ b/mkfs/common.h @@ -16,7 +16,7 @@ /* * Defines and function declarations for users of the mkfs API, no internal - * defintions. + * definitions. */ #ifndef __BTRFS_MKFS_COMMON_H__ @@ -45,7 +45,7 @@ enum btrfs_mkfs_block { struct btrfs_mkfs_config { /* Label of the new filesystem */ const char *label; - /* Blck sizes */ + /* Block sizes */ u32 nodesize; u32 sectorsize; u32 stripesize; diff --git a/mkfs/main.c b/mkfs/main.c index 9bfddf30..b76462a7 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1229,7 +1229,7 @@ raid_groups: if (source_dir_set) { ret = btrfs_mkfs_fill_dir(source_dir, root, verbose); if (ret) { - error("error wihle filling filesystem: %d", ret); + error("error while filling filesystem: %d", ret); goto out; } if (shrink_rootdir) { diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c index ff00bb0f..c430bac6 100644 --- a/mkfs/rootdir.c +++ b/mkfs/rootdir.c @@ -253,7 +253,7 @@ static int add_xattr_item(struct btrfs_trans_handle *trans, if (ret < 0) { if (errno == ENOTSUP) return 0; - error("gettig a xattr value failed for %s attr %s: %s", + error("getting a xattr value failed for %s attr %s: %s", file_name, cur_name, strerror(errno)); return ret; } @@ -467,7 +467,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, dir_entry->dir_name = dir_name; dir_entry->path = realpath(dir_name, NULL); if (!dir_entry->path) { - error("realpath failed for %s: %s", dir_name, strerror(errno)); + error("realpath failed for %s: %s", dir_name, strerror(errno)); ret = -1; goto fail_no_dir; } @@ -553,6 +553,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, (unsigned long)st.st_nlink); goto fail; } + ret = 0; continue; } if (ret) { @@ -745,7 +746,7 @@ u64 btrfs_mkfs_size_dir(const char *dir_name, u32 sectorsize, u64 min_dev_size, /* - * Maximum metadata useage for every inode, which will be PATH_MAX + * Maximum metadata usage for every inode, which will be PATH_MAX * for the following items: * 1) DIR_ITEM * 2) DIR_INDEX @@ -790,7 +791,7 @@ u64 btrfs_mkfs_size_dir(const char *dir_name, u32 sectorsize, u64 min_dev_size, /* * Get the end position of the last device extent for given @devid; - * @size_ret is exclsuive (means it should be aligned to sectorsize) + * @size_ret is exclusive (means it should be aligned to sectorsize) */ static int get_device_extent_end(struct btrfs_fs_info *fs_info, u64 devid, u64 *size_ret) @@ -851,7 +852,7 @@ static int set_device_size(struct btrfs_fs_info *fs_info, int ret; /* - * Update in-meory device->total_bytes, so that at trans commit time, + * Update in-memory device->total_bytes, so that at trans commit time, * super->dev_item will also get updated */ device->total_bytes = new_size; |