diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-10-25 16:13:35 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-11-11 22:07:35 -0500 |
| commit | 0ef8b726075aa6931ddf1c16f5bae043eef184f9 (patch) | |
| tree | 61c819e8541c69043a5d74182ac0f8d0060207e7 /fs/btrfs/inode.c | |
| parent | ed2590953bd06b892f0411fc94e19175d32f197a (diff) | |
| download | op-kernel-dev-0ef8b726075aa6931ddf1c16f5bae043eef184f9.zip op-kernel-dev-0ef8b726075aa6931ddf1c16f5bae043eef184f9.tar.gz | |
Btrfs: return an error from btrfs_wait_ordered_range
I noticed that if the free space cache has an error writing out it's data it
won't actually error out, it will just carry on. This is because it doesn't
check the return value of btrfs_wait_ordered_range, which didn't actually return
anything. So fix this in order to keep us from making free space cache look
valid when it really isnt. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 14c6ab7..f1fbf90 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7236,7 +7236,9 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, * outstanding dirty pages are on disk. */ count = iov_length(iov, nr_segs); - btrfs_wait_ordered_range(inode, offset, count); + ret = btrfs_wait_ordered_range(inode, offset, count); + if (ret) + return ret; if (rw & WRITE) { /* @@ -7577,7 +7579,10 @@ static int btrfs_truncate(struct inode *inode) u64 mask = root->sectorsize - 1; u64 min_size = btrfs_calc_trunc_metadata_size(root, 1); - btrfs_wait_ordered_range(inode, inode->i_size & (~mask), (u64)-1); + ret = btrfs_wait_ordered_range(inode, inode->i_size & (~mask), + (u64)-1); + if (ret) + return ret; /* * Yes ladies and gentelment, this is indeed ugly. The fact is we have |
