diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-24 11:47:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-24 11:47:43 -0700 |
| commit | d7b66b4ab0344dcc4bf169e0bbfda6234cdf6966 (patch) | |
| tree | 17a529125f0cd3d4904f44e7caf541e7827bd53d /fs | |
| parent | Revert "mm/cma: manage the memory of the CMA area by using the ZONE_MOVABLE" (diff) | |
| parent | Btrfs: fix error handling in btrfs_truncate() (diff) | |
| download | linux-dev-d7b66b4ab0344dcc4bf169e0bbfda6234cdf6966.tar.xz linux-dev-d7b66b4ab0344dcc4bf169e0bbfda6234cdf6966.zip | |
Merge tag 'for-4.17-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba:
"A one-liner that prevents leaking an internal error value 1 out of the
ftruncate syscall.
This has been observed in practice. The steps to reproduce make a
common pattern (open/write/fync/ftruncate) but also need the
application to not check only for negative values and happens only for
compressed inlined files.
The conditions are narrow but as this could break userspace I think
it's better to merge it now and not wait for the merge window"
* tag 'for-4.17-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix error handling in btrfs_truncate()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index d3862e7e4fee..0b86cf10cf2a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9117,7 +9117,8 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback) BTRFS_EXTENT_DATA_KEY); trans->block_rsv = &fs_info->trans_block_rsv; if (ret != -ENOSPC && ret != -EAGAIN) { - err = ret; + if (ret < 0) + err = ret; break; } |