public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [-mm patch] #if 0 mm/backing-dev.c:congestion_wait_interruptible()
@ 2007-07-01 20:20 Adrian Bunk
  2007-07-03 21:48 ` Andrew Morton
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2007-07-01 20:20 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Peter Zijlstra, Trond Myklebust, linux-kernel

congestion_wait_interruptible() is no longer used.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>

---

This patch has been sent on:
- 12 Jun 2007

 include/linux/backing-dev.h |    1 -
 mm/backing-dev.c            |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

--- 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-rc4-mm2/mm/backing-dev.c.old	2007-06-12 01:22:07.000000000 +0200
+++ linux-2.6.22-rc4-mm2/mm/backing-dev.c	2007-06-12 01:22:25.000000000 +0200
@@ -55,6 +55,7 @@
 }
 EXPORT_SYMBOL(congestion_wait);
 
+#if 0
 long congestion_wait_interruptible(int rw, long timeout)
 {
 	long ret;
@@ -70,6 +71,7 @@
 	return ret;
 }
 EXPORT_SYMBOL(congestion_wait_interruptible);
+#endif  /*  0  */
 
 /**
  * congestion_end - wake up sleepers on a congested backing_dev_info


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [-mm patch] #if 0 mm/backing-dev.c:congestion_wait_interruptible()
  2007-07-01 20:20 [-mm patch] #if 0 mm/backing-dev.c:congestion_wait_interruptible() Adrian Bunk
@ 2007-07-03 21:48 ` Andrew Morton
  2007-07-03 22:35   ` Trond Myklebust
  0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2007-07-03 21:48 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Peter Zijlstra, Trond Myklebust, linux-kernel

On Sun, 1 Jul 2007 22:20:51 +0200
Adrian Bunk <bunk@stusta.de> wrote:

> congestion_wait_interruptible() is no longer used.

We might as well just delete it?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [-mm patch] #if 0 mm/backing-dev.c:congestion_wait_interruptible()
  2007-07-03 21:48 ` Andrew Morton
@ 2007-07-03 22:35   ` Trond Myklebust
  2007-07-04  1:05     ` [2.6 patch] remove mm/backing-dev.c:congestion_wait_interruptible() Adrian Bunk
  0 siblings, 1 reply; 4+ messages in thread
From: Trond Myklebust @ 2007-07-03 22:35 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Adrian Bunk, Peter Zijlstra, linux-kernel

On Tue, 2007-07-03 at 14:48 -0700, Andrew Morton wrote:
> On Sun, 1 Jul 2007 22:20:51 +0200
> Adrian Bunk <bunk@stusta.de> 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.

Trond


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [2.6 patch] remove mm/backing-dev.c:congestion_wait_interruptible()
  2007-07-03 22:35   ` Trond Myklebust
@ 2007-07-04  1:05     ` Adrian Bunk
  0 siblings, 0 replies; 4+ messages in thread
From: Adrian Bunk @ 2007-07-04  1:05 UTC (permalink / raw)
  To: Trond Myklebust; +Cc: Andrew Morton, Peter Zijlstra, linux-kernel

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 <bunk@stusta.de> 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 <bunk@stusta.de>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>

---

 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-07-04  1:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-01 20:20 [-mm patch] #if 0 mm/backing-dev.c:congestion_wait_interruptible() Adrian Bunk
2007-07-03 21:48 ` Andrew Morton
2007-07-03 22:35   ` Trond Myklebust
2007-07-04  1:05     ` [2.6 patch] remove mm/backing-dev.c:congestion_wait_interruptible() Adrian Bunk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox