aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/fs/btrfs/tree-log.c
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2018-01-18 14:17:13 -0700
committerBob Peterson <rpeterso@redhat.com>2018-01-18 14:17:13 -0700
commit786ebd9f68cdf512f389e5f2d0015f1beb0777d8 (patch)
treeb4bae82884c2232f891aec11e58b38eb4fec5e5d /fs/btrfs/tree-log.c
parentgfs2: Trim the ordered write list in gfs2_ordered_write() (diff)
parentgfs2: Implement fallocate(FALLOC_FL_PUNCH_HOLE) (diff)
downloadwireguard-linux-786ebd9f68cdf512f389e5f2d0015f1beb0777d8.tar.xz
wireguard-linux-786ebd9f68cdf512f389e5f2d0015f1beb0777d8.zip
Merge branch 'punch-hole' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r--fs/btrfs/tree-log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index aa7c71cff575..7bf9b31561db 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4102,7 +4102,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,
if (ordered_io_err) {
ctx->io_err = -EIO;
- return 0;
+ return ctx->io_err;
}
btrfs_init_map_token(&token);