2.5.39-bk2 compile failure with CONFIG_XFS

All of lore.kernel.org
 help / color / mirror / Atom feed

* 2.5.39-bk2 compile failure with CONFIG_XFS_FS=y
@ 2002-09-30 15:50 Steven Cole
  2002-09-30 23:46 ` Christoph Hellwig
  0 siblings, 1 reply; 3+ messages in thread
From: Steven Cole @ 2002-09-30 15:50 UTC (permalink / raw)
  To: Linux Kernel

I got the following compile error building 2.5.39-bk2 with CONFIG_XFS_FS=y:

fs/xfs/pagebuf/page_buf.c: In function `pagebuf_queue_task':
fs/xfs/pagebuf/page_buf.c:1164: warning: implicit declaration of function `queue_task'
fs/xfs/pagebuf/page_buf.c: In function `pagebuf_iodone_daemon':
fs/xfs/pagebuf/page_buf.c:1709: warning: implicit declaration of function `TQ_ACTIVE'
fs/xfs/pagebuf/page_buf.c:1714: warning: implicit declaration of function `run_task_queue'
[snip]
fs/built-in.o: In function `pagebuf_queue_task':
fs/built-in.o(.text+0xcdee5): undefined reference to `queue_task'
fs/built-in.o: In function `pagebuf_iodone':
fs/built-in.o(.text+0xcdfb4): undefined reference to `queue_task'
fs/built-in.o: In function `pagebuf_iodone_daemon':
fs/built-in.o(.text+0xcea90): undefined reference to `TQ_ACTIVE'
fs/built-in.o(.text+0xceab6): undefined reference to `run_task_queue'
make: *** [.tmp_vmlinux] Error 1

Without CONFIG_XFS_FS=y or m, 2.5.39-bk2 compiles fine.
Plain vanilla 2.5.39 builds with CONFIG_XFS_FS=m.

Steven



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

* Re: 2.5.39-bk2 compile failure with CONFIG_XFS_FS=y
  2002-09-30 15:50 2.5.39-bk2 compile failure with CONFIG_XFS_FS=y Steven Cole
@ 2002-09-30 23:46 ` Christoph Hellwig
  2002-09-30 17:01   ` Steven Cole
  0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2002-09-30 23:46 UTC (permalink / raw)
  To: Steven Cole; +Cc: Linux Kernel

On Mon, Sep 30, 2002 at 09:50:02AM -0600, Steven Cole wrote:
> I got the following compile error building 2.5.39-bk2 with CONFIG_XFS_FS=y:

That's ingo smptimers work.  Quick hack below, but doesn't peform nicely
on smp..


diff -uNr -p linux-2.5.39-mm1/fs/xfs/pagebuf/page_buf.c linux-2.5.39/fs/xfs/pagebuf/page_buf.c
--- linux-2.5.39-mm1/fs/xfs/pagebuf/page_buf.c	Mon Sep 30 14:27:25 2002
+++ linux-2.5.39/fs/xfs/pagebuf/page_buf.c	Mon Sep 30 16:49:06 2002
@@ -160,8 +160,6 @@ pb_tracking_free(
 
 STATIC kmem_cache_t *pagebuf_cache;
 STATIC pagebuf_daemon_t *pb_daemon;
-STATIC struct list_head pagebuf_iodone_tq[NR_CPUS];
-STATIC wait_queue_head_t pagebuf_iodone_wait[NR_CPUS];
 STATIC void pagebuf_daemon_wakeup(int);
 
 /*
@@ -1157,15 +1155,6 @@ _pagebuf_wait_unpin(
 	current->state = TASK_RUNNING;
 }
 
-void
-pagebuf_queue_task(
-	struct tq_struct	*task)
-{
-	queue_task(task, &pagebuf_iodone_tq[smp_processor_id()]);
-	wake_up(&pagebuf_iodone_wait[smp_processor_id()]);
-}
-
-
 /*
  *	Buffer Utility Routines
  */
@@ -1210,9 +1199,8 @@ pagebuf_iodone(
 		INIT_TQUEUE(&pb->pb_iodone_sched,
 			pagebuf_iodone_sched, (void *)pb);
 
-		queue_task(&pb->pb_iodone_sched,
-				&pagebuf_iodone_tq[smp_processor_id()]);
-		wake_up(&pagebuf_iodone_wait[smp_processor_id()]);
+		schedule_task(&pb->pb_iodone_sched);
+
 	} else {
 		up(&pb->pb_iodonesema);
 	}
@@ -1666,62 +1654,6 @@ pagebuf_delwri_dequeue(
 	spin_unlock(&pb_daemon->pb_delwrite_lock);
 }
 
-
-/*
- * The pagebuf iodone daemon
- */
-
-STATIC int pb_daemons[NR_CPUS];
-
-STATIC int
-pagebuf_iodone_daemon(
-	void			*__bind_cpu)
-{
-	int			cpu = (long) __bind_cpu;
-	DECLARE_WAITQUEUE	(wait, current);
-
-	/*  Set up the thread  */
-	daemonize();
-
-	/* Avoid signals */
-	spin_lock_irq(&current->sig->siglock);
-	sigfillset(&current->blocked);
-	recalc_sigpending();
-	spin_unlock_irq(&current->sig->siglock);
-
-	/* Migrate to the right CPU */
-	set_cpus_allowed(current, 1UL << cpu);
-	if (smp_processor_id() != cpu)
-		BUG();
-
-	sprintf(current->comm, "pagebuf_io_CPU%d", cpu);
-	INIT_LIST_HEAD(&pagebuf_iodone_tq[cpu]);
-	init_waitqueue_head(&pagebuf_iodone_wait[cpu]);
-	__set_current_state(TASK_INTERRUPTIBLE);
-	mb();
-
-	pb_daemons[cpu] = 1;
-
-	for (;;) {
-		add_wait_queue(&pagebuf_iodone_wait[cpu],
-				&wait);
-
-		if (TQ_ACTIVE(pagebuf_iodone_tq[cpu]))
-			__set_task_state(current, TASK_RUNNING);
-		schedule();
-		remove_wait_queue(&pagebuf_iodone_wait[cpu],
-				&wait);
-		run_task_queue(&pagebuf_iodone_tq[cpu]);
-		if (pb_daemons[cpu] == 0)
-			break;
-		__set_current_state(TASK_INTERRUPTIBLE);
-	}
-
-	pb_daemons[cpu] = -1;
-	wake_up_interruptible(&pagebuf_iodone_wait[cpu]);
-	return 0;
-}
-
 /* Defines for pagebuf daemon */
 DECLARE_WAIT_QUEUE_HEAD(pbd_waitq);
 STATIC int force_flush;
@@ -1907,8 +1839,6 @@ STATIC int
 pagebuf_daemon_start(void)
 {
 	if (!pb_daemon) {
-		int		cpu;
-
 		pb_daemon = (pagebuf_daemon_t *)
 				kmalloc(sizeof(pagebuf_daemon_t), GFP_KERNEL);
 		if (!pb_daemon) {
@@ -1924,19 +1854,6 @@ pagebuf_daemon_start(void)
 
 		kernel_thread(pagebuf_daemon, (void *)pb_daemon,
 				CLONE_FS|CLONE_FILES|CLONE_VM);
-		for (cpu = 0; cpu < NR_CPUS; cpu++) {
-			if (!cpu_online(cpu))
-				continue;
-			if (kernel_thread(pagebuf_iodone_daemon,
-					(void *)(long) cpu,
-					CLONE_FS|CLONE_FILES|CLONE_VM) < 0) {
-				printk("pagebuf_daemon_start failed\n");
-			} else {
-				while (!pb_daemons[cpu]) {
-					yield();
-				}
-			}
-		}
 	}
 	return 0;
 }
@@ -1950,24 +1867,12 @@ STATIC void
 pagebuf_daemon_stop(void)
 {
 	if (pb_daemon) {
-		int		cpu;
-
 		pb_daemon->active = 0;
 		pb_daemon->io_active = 0;
 
 		wake_up_interruptible(&pbd_waitq);
 		while (pb_daemon->active == 0) {
 			interruptible_sleep_on(&pbd_waitq);
-		}
-		for (cpu = 0; cpu < NR_CPUS; cpu++) {
-			if (!cpu_online(cpu))
-				continue;
-			pb_daemons[cpu] = 0;
-			wake_up(&pagebuf_iodone_wait[cpu]);
-			while (pb_daemons[cpu] != -1) {
-				interruptible_sleep_on(
-					&pagebuf_iodone_wait[cpu]);
-			}
 		}
 
 		kfree(pb_daemon);
diff -uNr -p linux-2.5.39-mm1/fs/xfs/pagebuf/page_buf.h linux-2.5.39/fs/xfs/pagebuf/page_buf.h
--- linux-2.5.39-mm1/fs/xfs/pagebuf/page_buf.h	Mon Sep 30 14:13:46 2002
+++ linux-2.5.39/fs/xfs/pagebuf/page_buf.h	Mon Sep 30 16:15:25 2002
@@ -324,9 +324,6 @@ extern void pagebuf_unlock(		/* unlock b
 
 #define pagebuf_geterror(pb)	((pb)->pb_error)
 
-extern void pagebuf_queue_task(
-		struct tq_struct *);
-
 extern void pagebuf_iodone(		/* mark buffer I/O complete	*/
 		page_buf_t *);		/* buffer to mark		*/
 
diff -uNr -p linux-2.5.39-mm1/fs/xfs/xfs_log.c linux-2.5.39/fs/xfs/xfs_log.c
--- linux-2.5.39-mm1/fs/xfs/xfs_log.c	Mon Sep 30 14:15:55 2002
+++ linux-2.5.39/fs/xfs/xfs_log.c	Mon Sep 30 16:15:25 2002
@@ -2779,7 +2779,7 @@ xlog_state_release_iclog(xlog_t		*log,
 		case 0:
 			return xlog_sync(log, iclog, 0);
 		case 1:
-			pagebuf_queue_task(&iclog->ic_write_sched);
+		        schedule_task(&iclog->ic_write_sched);
 		}
 	}
 	return (0);

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

* Re: 2.5.39-bk2 compile failure with CONFIG_XFS_FS=y
  2002-09-30 23:46 ` Christoph Hellwig
@ 2002-09-30 17:01   ` Steven Cole
  0 siblings, 0 replies; 3+ messages in thread
From: Steven Cole @ 2002-09-30 17:01 UTC (permalink / raw)
  To: Christoph Hellwig; +Cc: Linux Kernel

On Mon, 2002-09-30 at 17:46, Christoph Hellwig wrote:
> On Mon, Sep 30, 2002 at 09:50:02AM -0600, Steven Cole wrote:
> > I got the following compile error building 2.5.39-bk2 with CONFIG_XFS_FS=y:
> 
> That's ingo smptimers work.  Quick hack below, but doesn't peform nicely
> on smp..
> 
[patch snipped]

Thanks.  That works for me for now.  Unfortunately, I only have an UP
box to do XFS testing presently, but I'll try to change that soon.  I'm
presently running dbench with increasing client counts on my xfs
partition with 3.5.39bk2.

Filesystem    Type    Size  Used Avail Use% Mounted on
/dev/hda1     ext3    236M   68M  156M  31% /
/dev/hda9     ext3     20G  3.5G   17G  18% /home
/dev/hda11     jfs    3.9G  5.3M  3.9G   1% /share_j
/dev/hda10
          reiserfs    4.0G   37M  3.9G   1% /share_r
/dev/hda12     xfs    4.8G  250M  4.6G   6% /share_x
/dev/hda8     ext3    236M  5.2M  219M   3% /tmp
/dev/hda6     ext3    2.9G  1.5G  1.3G  55% /usr
/dev/hda7     ext3    479M   83M  372M  19% /var

Steven


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

end of thread, other threads:[~2002-09-30 17:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-09-30 15:50 2.5.39-bk2 compile failure with CONFIG_XFS_FS=y Steven Cole
2002-09-30 23:46 ` Christoph Hellwig
2002-09-30 17:01   ` Steven Cole

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.