diff options
author | 2016-05-09 12:34:39 -0400 | |
---|---|---|
committer | 2016-05-09 12:34:39 -0400 | |
commit | 698f6700a6f19ba4550a722eaacf9f9d212b3fd9 (patch) | |
tree | ff63c9a23fe47870df8788ff5e7d9a552f6d4ed1 /fs/jbd2/commit.c | |
parent | libata-scsi: Set information sense field for invalid parameter (diff) | |
parent | megaraid_sas: Downgrade two success messages to info (diff) | |
download | wireguard-linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.tar.xz wireguard-linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.zip |
Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac
Pulling in the dependencies for further ZAC changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to '')
-rw-r--r-- | fs/jbd2/commit.c | 4 |
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: |