aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2/commit.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-06 22:01:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-06 22:01:47 -0400
commit053f78d359953be40043972c98e16b3f1cd9fc27 (patch)
tree80185e1554da6362dd3ca411a3e724864c59dc05 /fs/jbd2/commit.c
parent1bb025f6db789ea0bb674eaed15ee843ef0b2e88 (diff)
parent3d085c7413d32bb6895e5b9b5ee6a7d2180159c5 (diff)
Merge tag 'lkdtm-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-linus
Kees briefly writes: fixes some possible memory allocation leaks on error paths
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r--fs/jbd2/commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 517f2de784cf..2ad98d6e19f4 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -81,11 +81,11 @@ static void release_buffer_page(struct buffer_head *bh)
81 if (!trylock_page(page)) 81 if (!trylock_page(page))
82 goto nope; 82 goto nope;
83 83
84 page_cache_get(page); 84 get_page(page);
85 __brelse(bh); 85 __brelse(bh);
86 try_to_free_buffers(page); 86 try_to_free_buffers(page);
87 unlock_page(page); 87 unlock_page(page);
88 page_cache_release(page); 88 put_page(page);
89 return; 89 return;
90 90
91nope: 91nope: