Skip to contentSkip to conversation

#if 0 mm/backing-dev.c:congestion_wait_interruptible()

PATCH In review Adrian Bunk 3 participants 4 messages Jul 1, 2007 – Jul 4, 2007

Subsystems (2)
Memory management MM misc
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 #if 0 mm/backing-dev.c:congestion_wait_interruptible()

congestion_wait_interruptible() is no longer used.

Signed-off-by Adrian Bunk <[email protected]>
Acked-by Trond Myklebust <[email protected]>

---

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(-)
include/linux/backing-dev.h renamed from include/linux/backing-dev.h.old +0 -1
@@ -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) \
mm/backing-dev.c renamed from mm/backing-dev.c.old +2 -0
@@ -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
maintainer
#1 lore raw
Quoted 1 line · 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?

#2 lore raw
Quoted 6 lines · Andrew Morton
Quoted 1 line · 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.

Trond

author
#3 lore raw

PATCH 1/1 remove mm/backing-dev.c:congestion_wait_interruptible()

Quoted 9 lines · Trond Myklebust
Quoted 6 lines · Andrew Morton
Quoted 1 line · 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.

Quoted 1 line

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(-)
include/linux/backing-dev.h renamed from include/linux/backing-dev.h.old +0 -1
@@ -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) \
mm/backing-dev.c renamed from mm/backing-dev.c.old +0 -16
@@ -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