summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_buf.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-10-05 14:53:08 +0200
committerAlex Shi <alex.shi@linaro.org>2016-10-05 14:53:08 +0200
commitbe2a76aecfc5ed58ddf8925190cc1cfb519bf932 (patch)
treeaaeeec8a45d7be02a3fdc00f6f63273a0df6f7e2 /fs/xfs/xfs_buf.c
parent10fd238c91a8dd2fb9c9bce99eb4d357254fb3c6 (diff)
parentd19e48fe5da7b83d02ed4aec3567f08ae02a168c (diff)
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Diffstat (limited to 'fs/xfs/xfs_buf.c')
-rw-r--r--fs/xfs/xfs_buf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 39090fc56f09..eb1b8c8acfcb 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1535,7 +1535,7 @@ xfs_wait_buftarg(
* ensure here that all reference counts have been dropped before we
* start walking the LRU list.
*/
- drain_workqueue(btp->bt_mount->m_buf_workqueue);
+ flush_workqueue(btp->bt_mount->m_buf_workqueue);
/* loop until there is nothing left on the lru list. */
while (list_lru_count(&btp->bt_lru)) {