diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-15 14:27:55 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-15 14:27:55 +0800 |
commit | c24745baffdb7143d6f345659fb6d781b070ca50 (patch) | |
tree | ca64c4281fc67fe7acd6740377b12b332f6b1383 | |
parent | a2c367516125befe08c6e5469a9ab00ef9370e4b (diff) | |
parent | 3cc495c0b44ea78379d7fe34c0346117c3504672 (diff) |
Merge branch 'v4.1/topic/writeback-cg' into linux-linaro-lsk-v4.1
-rw-r--r-- | block/bio.c | 2 | ||||
-rw-r--r-- | fs/fs-writeback.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/block/bio.c b/block/bio.c index c653bfe982e0..167e5ec31717 100644 --- a/block/bio.c +++ b/block/bio.c @@ -2004,6 +2004,7 @@ int bio_associate_blkcg(struct bio *bio, struct cgroup_subsys_state *blkcg_css) bio->bi_css = blkcg_css; return 0; } +EXPORT_SYMBOL_GPL(bio_associate_blkcg); /** * bio_associate_current - associate a bio with %current @@ -2034,6 +2035,7 @@ int bio_associate_current(struct bio *bio) bio->bi_css = task_get_css(current, blkio_cgrp_id); return 0; } +EXPORT_SYMBOL_GPL(bio_associate_current); /** * bio_disassociate_task - undo bio_associate_current() 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 |