From ab7e106c419d8719b4eb6a44ffd8611eae9051de Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Mon, 9 May 2016 20:04:02 -0400 Subject: [PATCH] From: Nicholas D Steeves Date: Mon, 09 May 2016 20:04:57 -0400 Trivial fix for typos in comments and strings. --- btrfs-convert.c | 2 +- btrfs-image.c | 2 +- cmds-balance.c | 2 +- cmds-check.c | 2 +- cmds-scrub.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/btrfs-convert.c b/btrfs-convert.c index b49775cc00..76454680b7 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2656,7 +2656,7 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt close(fd); if (is_btrfs) fprintf(stderr, - "WARNING: an error occured during chunk mapping fixup, filesystem mountable but not finalized\n"); + "WARNING: an error occurred during chunk mapping fixup, filesystem mountable but not finalized\n"); else fprintf(stderr, "conversion aborted\n"); return -1; diff --git a/btrfs-image.c b/btrfs-image.c index 5c4c6faca5..f6699cc170 100644 --- a/btrfs-image.c +++ b/btrfs-image.c @@ -2038,7 +2038,7 @@ static int read_chunk_block(struct mdrestore_struct *mdres, u8 *buffer, fs_chunk = malloc(sizeof(struct fs_chunk)); if (!fs_chunk) { - fprintf(stderr, "Erorr allocating chunk\n"); + fprintf(stderr, "Error allocating chunk\n"); ret = -ENOMEM; break; } diff --git a/cmds-balance.c b/cmds-balance.c index 5f05f603d4..e2b05a331a 100644 --- a/cmds-balance.c +++ b/cmds-balance.c @@ -876,7 +876,7 @@ static int cmd_balance_full(int argc, char **argv) } static const char balance_cmd_group_info[] = -"balance data accross devices, or change block groups using filters"; +"balance data across devices, or change block groups using filters"; const struct cmd_group balance_cmd_group = { balance_cmd_group_usage, balance_cmd_group_info, { diff --git a/cmds-check.c b/cmds-check.c index 127ac977bf..628cde43e0 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -5539,7 +5539,7 @@ static int check_space_cache(struct btrfs_root *root) ret = verify_space_cache(root, cache); if (ret) { - fprintf(stderr, "cache appears valid but isnt %Lu\n", + fprintf(stderr, "cache appears valid but isn't %Lu\n", cache->key.objectid); error++; } diff --git a/cmds-scrub.c b/cmds-scrub.c index de7005c141..4a1d47510d 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -430,7 +430,7 @@ static int scrub_rename_file(const char *fn_base, const char *fn_local, /* * returns 0 if the key did not match (nothing was read) * 1 if the key did match (success) - * -1 if the key did match and an error occured + * -1 if the key did match and an error occurred */ static int scrub_kvread(int *i, int len, int avail, const char *buf, const char *key, u64 *dest)