Return to fix-kdb-modules CVS log

Up to [Development] / linux-2.6-xfs / split-patches

Fix up some KDB module compilation issues.
Merge of 2.6.x-xfs-melb:linux:25120a by kenmcd.

Index: 2.6.x-xfs/kdb/modules/kdbm_pg.c
===================================================================
--- 2.6.x-xfs.orig/kdb/modules/kdbm_pg.c	2006-02-06 11:10:38.591899313 +1100
+++ 2.6.x-xfs/kdb/modules/kdbm_pg.c	2006-02-06 13:21:29.551778251 +1100
@@ -228,7 +228,7 @@
 	if (page_has_buffers(&page))
 		kdb_printf("  buffers 0x%p\n", page_buffers(&page));
 	else
-		kdb_printf("  private 0x%lx\n", page.u.private);
+		kdb_printf("  private 0x%lx\n", page_private(&page));
 
 	return 0;
 }
@@ -370,8 +370,8 @@
 		do {
 			do_buffer((unsigned long) bh);
 		} while ((bh = bh->b_this_page) != head);
-	} else if (page->u.private) {
-		kdb_printf(" private= 0x%lx", page->u.private);
+	} else if (page_private(page)) {
+		kdb_printf(" private= 0x%lx", page_private(page));
 	}
 	kdb_printf("\n");
 #undef kdb_page_flags
Index: 2.6.x-xfs/kdb/modules/kdbm_vm.c
===================================================================
--- 2.6.x-xfs.orig/kdb/modules/kdbm_vm.c	2006-02-06 11:10:38.594828598 +1100
+++ 2.6.x-xfs/kdb/modules/kdbm_vm.c	2006-02-06 13:21:34.690720578 +1100
@@ -495,7 +495,7 @@
 					d.d_lru.next, d.d_lru.prev);
 
 	kdb_printf(" d_child.nxt = 0x%p d_child.prv = 0x%p\n",
-					d.d_child.next, d.d_child.prev);
+					d.d_u.d_child.next, d.d_u.d_child.prev);
 
 	kdb_printf(" d_subdirs.nxt = 0x%p d_subdirs.prv = 0x%p\n",
 					d.d_subdirs.next, d.d_subdirs.prev);