diff options
| author | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
| commit | 45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8 (patch) | |
| tree | a5e7c8428030ec0462b58133d6548ddff3802018 /fs/btrfs/tree-log.c | |
| parent | fc8517bf627c9b834f80274a1bc9ecd39b27231b (diff) | |
| parent | 2973633e9f09311e849f975d969737af81a521ff (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up inside-secure fixes.
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
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, | |||
| 4102 | 4102 | ||
| 4103 | if (ordered_io_err) { | 4103 | if (ordered_io_err) { |
| 4104 | ctx->io_err = -EIO; | 4104 | ctx->io_err = -EIO; |
| 4105 | return 0; | 4105 | return ctx->io_err; |
| 4106 | } | 4106 | } |
| 4107 | 4107 | ||
| 4108 | btrfs_init_map_token(&token); | 4108 | btrfs_init_map_token(&token); |