diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /fs/fs-writeback.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'fs/fs-writeback.c')
| -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, | |||
| 702 | else | 702 | else |
| 703 | wbc->wb_tcand_bytes -= min(bytes, wbc->wb_tcand_bytes); | 703 | wbc->wb_tcand_bytes -= min(bytes, wbc->wb_tcand_bytes); |
| 704 | } | 704 | } |
| 705 | EXPORT_SYMBOL_GPL(wbc_account_io); | ||
| 705 | 706 | ||
| 706 | /** | 707 | /** |
| 707 | * inode_congested - test whether an inode is congested | 708 | * inode_congested - test whether an inode is congested |