diff options
| -rw-r--r-- | fs/nfs/write.c | 4 | ||||
| -rw-r--r-- | include/linux/backing-dev.h | 1 | ||||
| -rw-r--r-- | mm/backing-dev.c | 13 |
3 files changed, 1 insertions, 17 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index e2bb66c3440..82d7ee98c67 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -242,10 +242,8 @@ static void nfs_end_page_writeback(struct page *page) struct nfs_server *nfss = NFS_SERVER(inode); end_page_writeback(page); - if (atomic_long_dec_return(&nfss->writeback) < NFS_CONGESTION_OFF_THRESH) { + if (atomic_long_dec_return(&nfss->writeback) < NFS_CONGESTION_OFF_THRESH) clear_bdi_congested(&nfss->backing_dev_info, WRITE); - congestion_end(WRITE); - } } /* diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 7011d625559..210933c336f 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) void clear_bdi_congested(struct backing_dev_info *bdi, int rw); void set_bdi_congested(struct backing_dev_info *bdi, int rw); long congestion_wait(int rw, long timeout); -void congestion_end(int rw); #define bdi_cap_writeback_dirty(bdi) \ (!((bdi)->capabilities & BDI_CAP_NO_WRITEBACK)) diff --git a/mm/backing-dev.c b/mm/backing-dev.c index f50a2811f9d..841901a9559 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -54,16 +54,3 @@ long congestion_wait(int rw, long timeout) return ret; } EXPORT_SYMBOL(congestion_wait); - -/** - * congestion_end - wake up sleepers on a congested backing_dev_info - * @rw: READ or WRITE - */ -void congestion_end(int rw) -{ - wait_queue_head_t *wqh = &congestion_wqh[rw]; - - if (waitqueue_active(wqh)) - wake_up(wqh); -} -EXPORT_SYMBOL(congestion_end); |