diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 02:00:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 02:00:04 +0200 |
| commit | 33b40178cb3bd75294d1a758b3f509a0d38682ab (patch) | |
| tree | d5c29280f425cfbcd6f6ca247b2a776c8f787cec /fs | |
| parent | Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | block: Do a full clone when splitting discard bios (diff) | |
| download | linux-33b40178cb3bd75294d1a758b3f509a0d38682ab.tar.xz linux-33b40178cb3bd75294d1a758b3f509a0d38682ab.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Four smaller fixes for the current series. This contains:
- A fix for clones of discard bio's, that can cause data corruption.
From Martin.
- A fix for null_blk, where in certain queue modes it could access a
request after it had been freed. From Mike Krinkin.
- An error handling leak fix for blkcg, from Tejun.
- Also from Tejun, export of the functions that a file system needs
to implement cgroup writeback support"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: Do a full clone when splitting discard bios
block: export bio_associate_*() and wbc_account_io()
blkcg: fix gendisk reference leak in blkg_conf_prep()
null_blk: fix use-after-free problem
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fs-writeback.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index f0520bcf2094..518c6294bf6c 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -702,6 +702,7 @@ void wbc_account_io(struct writeback_control *wbc, struct page *page, else wbc->wb_tcand_bytes -= min(bytes, wbc->wb_tcand_bytes); } +EXPORT_SYMBOL_GPL(wbc_account_io); /** * inode_congested - test whether an inode is congested |