From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 18 Aug 2020 15:33:49 +0000 (-0700)
Subject: Merge branch 'filelock_assert_fix' of https://github.com/bardavid/fio into master
X-Git-Tag: fio-3.23~30
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3c1f3ca75b447a2bd0a93deb0a2a1210529d2ccb;p=fio.git

Merge branch 'filelock_assert_fix' of https://github.com/bardavid/fio into master

* 'filelock_assert_fix' of https://github.com/bardavid/fio:
  filelock: fix wrong file trylock assertion.
---

3c1f3ca75b447a2bd0a93deb0a2a1210529d2ccb