diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:22:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:22:41 +1100 |
| commit | bd617c323e81c308dd087282fbcc1efe6deec8fb (patch) | |
| tree | 1309daa3021e0fcf2e069879b02675649e819a0f /fs | |
| parent | f7f483b7c64695af05e1ce58cc23001631281fe4 (diff) | |
| parent | 6fe495e0f80ebe98e311006e6ab491643340917f (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/gpu/drm/qxl/Kconfig
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/tests/free-space-tests.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c index 6fc82010dc15..c8d9ddf84c69 100644 --- a/fs/btrfs/tests/free-space-tests.c +++ b/fs/btrfs/tests/free-space-tests.c @@ -101,7 +101,7 @@ static int test_extents(struct btrfs_block_group_cache *cache) ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096); if (ret) { - test_msg("Error removing middle peice %d\n", ret); + test_msg("Error removing middle piece %d\n", ret); return ret; } @@ -266,7 +266,7 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache) } if (test_check_exists(cache, 512 * 1024, 3 * 1024 * 1024)) { - test_msg("Left over peices after removing overlapping\n"); + test_msg("Left over pieces after removing overlapping\n"); return -1; } |