diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-06 14:01:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-06 14:01:15 -0700 |
| commit | ca16eb342ebedbf3bb1d8450048fe428895b0b65 (patch) | |
| tree | 926d774db9a92c1cc747b3cee1195566ba1955f9 /block/bfq-cgroup.c | |
| parent | db44bf4b4768a0664d3c9d9000ecb747de31ded8 (diff) | |
| parent | d5274b3cd6a814ccb2f56d81ee87cbbf51bd4cf7 (diff) | |
Merge tag 'for-linus-20180906' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Small collection of fixes that should go into this release. This
contains:
- Small series that fixes a race between blkcg teardown and writeback
(Dennis Zhou)
- Fix disallowing invalid block size settings from the nbd ioctl (me)
- BFQ fix for a use-after-free on last release of a bfqg (Konstantin
Khlebnikov)
- Fix for the "don't warn for flush" fix (Mikulas)"
* tag 'for-linus-20180906' of git://git.kernel.dk/linux-block:
block: bfq: swap puts in bfqg_and_blkg_put
block: don't warn when doing fsync on read-only devices
nbd: don't allow invalid blocksize settings
blkcg: use tryget logic when associating a blkg with a bio
blkcg: delay blkg destruction until after writeback has finished
Revert "blk-throttle: fix race between blkcg_bio_issue_check() and cgroup_rmdir()"
Diffstat (limited to 'block/bfq-cgroup.c')
| -rw-r--r-- | block/bfq-cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 58c6efa9f9a9..9fe5952d117d 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -275,9 +275,9 @@ static void bfqg_and_blkg_get(struct bfq_group *bfqg) void bfqg_and_blkg_put(struct bfq_group *bfqg) { - bfqg_put(bfqg); - blkg_put(bfqg_to_blkg(bfqg)); + + bfqg_put(bfqg); } /* @stats = 0 */ |