diff options
| author | Josef Bacik <josef@redhat.com> | 2012-05-23 16:10:14 -0400 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2012-05-30 10:23:38 -0400 |
| commit | 2adcac1a7331d93a17285804819caa96070b231f (patch) | |
| tree | d5da1421dc605b64d34bc0cab4ae91de086499fa /fs/btrfs | |
| parent | 8a35d95ff4680a456d3ce47df9638f33d4f54f20 (diff) | |
| download | blackbird-obmc-linux-2adcac1a7331d93a17285804819caa96070b231f.tar.gz blackbird-obmc-linux-2adcac1a7331d93a17285804819caa96070b231f.zip | |
Btrfs: fall back to non-inline if we don't have enough space
If cow_file_range_inline fails with ENOSPC we abort the transaction which
isn't very nice. This really shouldn't be happening anyways but there's no
sense in making it a horrible error when we can easily just go allocate
normal data space for this stuff. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 029892887fc1..92df0a5d1d94 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -257,10 +257,13 @@ static noinline int cow_file_range_inline(struct btrfs_trans_handle *trans, ret = insert_inline_extent(trans, root, inode, start, inline_len, compressed_size, compress_type, compressed_pages); - if (ret) { + if (ret && ret != -ENOSPC) { btrfs_abort_transaction(trans, root, ret); return ret; + } else if (ret == -ENOSPC) { + return 1; } + btrfs_delalloc_release_metadata(inode, end + 1 - start); btrfs_drop_extent_cache(inode, start, aligned_end - 1, 0); return 0; |
