diff options
| author | Chris Mason <clm@fb.com> | 2016-05-26 12:49:21 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-26 12:49:21 -0700 |
| commit | 9257b4ca9dff074918164e4fa10e9001c62bc27a (patch) | |
| tree | b2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/file.c | |
| parent | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (diff) | |
| parent | 4c6143dd497901e3537dc4324dc203dfda442009 (diff) | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index af059c44684d..1933e8b07ed7 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2026,7 +2026,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) BTRFS_I(inode)->last_trans <= root->fs_info->last_trans_committed)) { /* - * We'v had everything committed since the last time we were + * We've had everything committed since the last time we were * modified so clear this flag in case it was set for whatever * reason, it's no longer relevant. */ @@ -2374,7 +2374,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) /* Check the aligned pages after the first unaligned page, * if offset != orig_start, which means the first unaligned page - * including serveral following pages are already in holes, + * including several following pages are already in holes, * the extra check can be skipped */ if (offset == orig_start) { /* after truncate page, check hole again */ |