aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/write.c4
-rw-r--r--include/linux/backing-dev.h1
-rw-r--r--mm/backing-dev.c13
3 files changed, 1 insertions, 17 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index e2bb66c34406..82d7ee98c675 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -242,10 +242,8 @@ static void nfs_end_page_writeback(struct page *page)
242 struct nfs_server *nfss = NFS_SERVER(inode); 242 struct nfs_server *nfss = NFS_SERVER(inode);
243 243
244 end_page_writeback(page); 244 end_page_writeback(page);
245 if (atomic_long_dec_return(&nfss->writeback) < NFS_CONGESTION_OFF_THRESH) { 245 if (atomic_long_dec_return(&nfss->writeback) < NFS_CONGESTION_OFF_THRESH)
246 clear_bdi_congested(&nfss->backing_dev_info, WRITE); 246 clear_bdi_congested(&nfss->backing_dev_info, WRITE);
247 congestion_end(WRITE);
248 }
249} 247}
250 248
251/* 249/*
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 7011d6255593..210933c336f5 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -93,7 +93,6 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi)
93void clear_bdi_congested(struct backing_dev_info *bdi, int rw); 93void clear_bdi_congested(struct backing_dev_info *bdi, int rw);
94void set_bdi_congested(struct backing_dev_info *bdi, int rw); 94void set_bdi_congested(struct backing_dev_info *bdi, int rw);
95long congestion_wait(int rw, long timeout); 95long congestion_wait(int rw, long timeout);
96void congestion_end(int rw);
97 96
98#define bdi_cap_writeback_dirty(bdi) \ 97#define bdi_cap_writeback_dirty(bdi) \
99 (!((bdi)->capabilities & BDI_CAP_NO_WRITEBACK)) 98 (!((bdi)->capabilities & BDI_CAP_NO_WRITEBACK))
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index f50a2811f9dc..841901a95595 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -54,16 +54,3 @@ long congestion_wait(int rw, long timeout)
54 return ret; 54 return ret;
55} 55}
56EXPORT_SYMBOL(congestion_wait); 56EXPORT_SYMBOL(congestion_wait);
57
58/**
59 * congestion_end - wake up sleepers on a congested backing_dev_info
60 * @rw: READ or WRITE
61 */
62void congestion_end(int rw)
63{
64 wait_queue_head_t *wqh = &congestion_wqh[rw];
65
66 if (waitqueue_active(wqh))
67 wake_up(wqh);
68}
69EXPORT_SYMBOL(congestion_end);