On Tue, Jul 03, 2007 at 06:35:36PM -0400, Trond Myklebust wrote: > On Tue, 2007-07-03 at 14:48 -0700, Andrew Morton wrote: > > On Sun, 1 Jul 2007 22:20:51 +0200 > > Adrian Bunk <[EMAIL PROTECTED]> wrote: > > > > > congestion_wait_interruptible() is no longer used. > > > > We might as well just delete it? > > I agree. We're better off deleting it, but either would be fine by me.
Updated patch below. > Trond cu Adrian <-- snip --> congestion_wait_interruptible() is no longer used. Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> Acked-by: Trond Myklebust <[EMAIL PROTECTED]> --- include/linux/backing-dev.h | 1 - mm/backing-dev.c | 16 ---------------- 2 files changed, 17 deletions(-) --- linux-2.6.22-rc4-mm2/include/linux/backing-dev.h.old 2007-06-12 01:21:52.000000000 +0200 +++ linux-2.6.22-rc4-mm2/include/linux/backing-dev.h 2007-06-12 01:22:00.000000000 +0200 @@ -93,7 +93,6 @@ 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); -long congestion_wait_interruptible(int rw, long timeout); void congestion_end(int rw); #define bdi_cap_writeback_dirty(bdi) \ --- linux-2.6.22-rc6-mm1/mm/backing-dev.c.old 2007-07-04 00:44:10.000000000 +0200 +++ linux-2.6.22-rc6-mm1/mm/backing-dev.c 2007-07-04 00:44:24.000000000 +0200 @@ -55,22 +55,6 @@ } EXPORT_SYMBOL(congestion_wait); -long congestion_wait_interruptible(int rw, long timeout) -{ - long ret; - DEFINE_WAIT(wait); - wait_queue_head_t *wqh = &congestion_wqh[rw]; - - prepare_to_wait(wqh, &wait, TASK_INTERRUPTIBLE); - if (signal_pending(current)) - ret = -ERESTARTSYS; - else - ret = io_schedule_timeout(timeout); - finish_wait(wqh, &wait); - return ret; -} -EXPORT_SYMBOL(congestion_wait_interruptible); - /** * congestion_end - wake up sleepers on a congested backing_dev_info * @rw: READ or WRITE - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/