Commit 7511821e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nathan Scott

[XFS] remove two dead members from pagebuf_daemon

SGI Modid: 2.5.x-xfs:slinx:134222a
parent e6a39e62
...@@ -1597,9 +1597,8 @@ pagebuf_delwri_queue( ...@@ -1597,9 +1597,8 @@ pagebuf_delwri_queue(
atomic_dec(&pb->pb_hold); atomic_dec(&pb->pb_hold);
} }
list_del(&pb->pb_list); list_del(&pb->pb_list);
} else {
pb_daemon->pb_delwri_cnt++;
} }
list_add_tail(&pb->pb_list, &pb_daemon->pb_delwrite_l); list_add_tail(&pb->pb_list, &pb_daemon->pb_delwrite_l);
PBP(pb)->pb_flushtime = jiffies + pb_params.p_un.age_buffer; PBP(pb)->pb_flushtime = jiffies + pb_params.p_un.age_buffer;
spin_unlock(&pb_daemon->pb_delwrite_lock); spin_unlock(&pb_daemon->pb_delwrite_lock);
...@@ -1617,7 +1616,6 @@ pagebuf_delwri_dequeue( ...@@ -1617,7 +1616,6 @@ pagebuf_delwri_dequeue(
spin_lock(&pb_daemon->pb_delwrite_lock); spin_lock(&pb_daemon->pb_delwrite_lock);
list_del_init(&pb->pb_list); list_del_init(&pb->pb_list);
pb->pb_flags &= ~PBF_DELWRI; pb->pb_flags &= ~PBF_DELWRI;
pb_daemon->pb_delwri_cnt--;
spin_unlock(&pb_daemon->pb_delwrite_lock); spin_unlock(&pb_daemon->pb_delwrite_lock);
} }
...@@ -1812,8 +1810,6 @@ pagebuf_daemon_start(void) ...@@ -1812,8 +1810,6 @@ pagebuf_daemon_start(void)
} }
pb_daemon->active = 1; pb_daemon->active = 1;
pb_daemon->io_active = 1;
pb_daemon->pb_delwri_cnt = 0;
pb_daemon->pb_delwrite_lock = SPIN_LOCK_UNLOCKED; pb_daemon->pb_delwrite_lock = SPIN_LOCK_UNLOCKED;
INIT_LIST_HEAD(&pb_daemon->pb_delwrite_l); INIT_LIST_HEAD(&pb_daemon->pb_delwrite_l);
...@@ -1840,7 +1836,6 @@ pagebuf_daemon_stop(void) ...@@ -1840,7 +1836,6 @@ pagebuf_daemon_stop(void)
destroy_workqueue(pagebuf_workqueue); destroy_workqueue(pagebuf_workqueue);
pb_daemon->active = 0; pb_daemon->active = 0;
pb_daemon->io_active = 0;
wake_up_interruptible(&pbd_waitq); wake_up_interruptible(&pbd_waitq);
while (pb_daemon->active == 0) { while (pb_daemon->active == 0) {
......
...@@ -97,10 +97,8 @@ struct pagebuf_trace_buf { ...@@ -97,10 +97,8 @@ struct pagebuf_trace_buf {
typedef struct pagebuf_daemon { typedef struct pagebuf_daemon {
int active; int active;
int io_active;
spinlock_t pb_delwrite_lock; spinlock_t pb_delwrite_lock;
struct list_head pb_delwrite_l; struct list_head pb_delwrite_l;
int pb_delwri_cnt;
} pagebuf_daemon_t; } pagebuf_daemon_t;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment