diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:19:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:19:13 +0200 |
| commit | 413d63d71b222108d19703f3fd5cf9108652a730 (patch) | |
| tree | 4680de6aebb6430dc5f3d9327f86d65149e6b5ae /fs/xfs/xfs_log_cil.c | |
| parent | d6c8103b0265d8db30e20e948a4f06382bbdaea7 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts
Conflicts:
arch/x86/kernel/head64.c
arch/x86/mm/mmap.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')
| -rw-r--r-- | fs/xfs/xfs_log_cil.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index fbe72b134bef..43aa42a3a5d3 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -539,6 +539,7 @@ xlog_discard_endio( INIT_WORK(&ctx->discard_endio_work, xlog_discard_endio_work); queue_work(xfs_discard_wq, &ctx->discard_endio_work); + bio_put(bio); } static void |