From e59c0640c450809fab0964ea61063fc040c122d4 Mon Sep 17 00:00:00 2001 From: liangzhen Date: Fri, 29 Apr 2005 07:47:10 +0000 Subject: [PATCH] Patch for collect_pages_on_cpu() in tracefile. (Wrong tage list is initialized) Reviewd by Wangdi. --- lnet/libcfs/module.c | 2 +- lnet/libcfs/tracefile.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c index 84c124c..76a4503 100644 --- a/lnet/libcfs/module.c +++ b/lnet/libcfs/module.c @@ -342,7 +342,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a if (portal_ioctl_getdata(buf, buf + 800, (void *)arg)) { CERROR("PORTALS ioctl: data error\n"); - return (-EINVAL); + RETURN(-EINVAL); } data = (struct portal_ioctl_data *)buf; diff --git a/lnet/libcfs/tracefile.c b/lnet/libcfs/tracefile.c index a1dab74..66d4aeb 100644 --- a/lnet/libcfs/tracefile.c +++ b/lnet/libcfs/tracefile.c @@ -255,7 +255,7 @@ static void collect_pages_on_cpu(void *info) tcd->tcd_cur_pages = 0; if (pc->pc_want_daemon_pages) { list_splice(&tcd->tcd_daemon_pages, &pc->pc_pages); - CFS_INIT_LIST_HEAD(&tcd->tcd_pages); + CFS_INIT_LIST_HEAD(&tcd->tcd_daemon_pages); tcd->tcd_cur_daemon_pages = 0; } spin_unlock(&pc->pc_lock); @@ -364,6 +364,7 @@ void trace_debug_print(void) spin_lock_init(&pc.pc_lock); + pc.pc_want_daemon_pages = 1; collect_pages(&pc); list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { char *p, *file, *fn; @@ -456,6 +457,7 @@ void trace_flush_pages(void) spin_lock_init(&pc.pc_lock); + pc.pc_want_daemon_pages = 1; collect_pages(&pc); list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { -- 1.8.3.1