summaryrefslogtreecommitdiff
path: root/fs/jbd2/commit.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-23 14:16:36 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-23 14:16:36 +0200
commit84eaae155a16d7864f0f814934e5062885cb0709 (patch)
treeafdbb8a4375a2d755f6e4d63767396bfc4124c50 /fs/jbd2/commit.c
parentf454bfddf6ba557381d8bf5df50eff778602ff23 (diff)
parentc3b46c73264b03000d1e18b22f5caf63332547c9 (diff)
downloadlwn-84eaae155a16d7864f0f814934e5062885cb0709.tar.gz
lwn-84eaae155a16d7864f0f814934e5062885cb0709.zip
Merge tag 'v4.6-rc4' into sched/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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)
if (!trylock_page(page))
goto nope;
- page_cache_get(page);
+ get_page(page);
__brelse(bh);
try_to_free_buffers(page);
unlock_page(page);
- page_cache_release(page);
+ put_page(page);
return;
nope: