Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 275a082f authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Add a real API for dealing with blk_congestion_wait() 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 94a6d753

block/ll_rw_blk.c

+12 −0
Original line number Diff line number Diff line
@@ -2734,6 +2734,18 @@ long blk_congestion_wait(int rw, long timeout) 


EXPORT_SYMBOL(blk_congestion_wait);



/**

 * blk_congestion_end - wake up sleepers on a congestion queue

 * @rw: READ or WRITE

 */

void blk_congestion_end(int rw)

{

	wait_queue_head_t *wqh = &congestion_wqh[rw];



	if (waitqueue_active(wqh))

		wake_up(wqh);

}



/*

 * Has to be called with the request spinlock acquired

 */

fs/nfs/write.c

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc) 
out:

	clear_bit(BDI_write_congested, &bdi->state);

	wake_up_all(&nfs_write_congestion);

	writeback_congestion_end();

	return err;

}

include/linux/blkdev.h

+1 −0
Original line number Diff line number Diff line
@@ -746,6 +746,7 @@ extern void blk_queue_free_tags(request_queue_t *); 
extern int blk_queue_resize_tags(request_queue_t *, int);

extern void blk_queue_invalidate_tags(request_queue_t *);

extern long blk_congestion_wait(int rw, long timeout);

extern void blk_congestion_end(int rw);



extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);

extern int blkdev_issue_flush(struct block_device *, sector_t *);

include/linux/writeback.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ int wakeup_pdflush(long nr_pages); 
void laptop_io_completion(void);

void laptop_sync_completion(void);

void throttle_vm_writeout(void);

void writeback_congestion_end(void);



/* These are exported to sysctl. */

extern int dirty_background_ratio;

mm/page-writeback.c

+9 −0
Original line number Diff line number Diff line
@@ -802,6 +802,15 @@ int test_set_page_writeback(struct page *page) 
}

EXPORT_SYMBOL(test_set_page_writeback);



/*

 * Wakes up tasks that are being throttled due to writeback congestion

 */

void writeback_congestion_end(void)

{

	blk_congestion_end(WRITE);

}

EXPORT_SYMBOL(writeback_congestion_end);



/*

 * Return true if any of the pages in the mapping are marged with the

 * passed tag.