Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

From: Nicholas D Steeves <nsteeves@gmail.com> #14

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion btrfs-convert.c
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion btrfs-image.c
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion cmds-balance.c
Original file line number Diff line number Diff line change
@@ -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, {
2 changes: 1 addition & 1 deletion cmds-check.c
Original file line number Diff line number Diff line change
@@ -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++;
}
2 changes: 1 addition & 1 deletion cmds-scrub.c
Original file line number Diff line number Diff line change
@@ -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)