diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-04 13:44:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-04 13:44:24 +1000 |
| commit | 56117a7c264a1bcd91aeb8144706057977f000dc (patch) | |
| tree | 7304868c3256b80ad4698cc18177766f1b58912a /fs | |
| parent | 488ebb613be3d6b1e4a1e2efe7a7d215d15b8654 (diff) | |
| parent | e3d1848f29d6f02d74ea978e1a699bde5802d7d4 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/networking/netlink_mmap.txt
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 02fae7f7e42c..17dffe33e8d0 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -4430,7 +4430,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path, } /* - * make the item pointed to by the path bigger, data_size is the new size. + * make the item pointed to by the path bigger, data_size is the added size. */ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path, u32 data_size) diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index e53009657f0e..2750b5023526 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -3200,7 +3200,7 @@ static int test_extents(struct btrfs_block_group_cache *cache) ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096); if (ret) { - printk(KERN_ERR "Error removing middle peice %d\n", ret); + printk(KERN_ERR "Error removing middle piece %d\n", ret); return ret; } |