Index: linux-2.6.20-rc4-mm1/include/linux/cpuset.h
===================================================================
--- linux-2.6.20-rc4-mm1.orig/include/linux/cpuset.h	2007-01-12 13:21:31.000000000 -0800
+++ linux-2.6.20-rc4-mm1/include/linux/cpuset.h	2007-01-12 13:22:36.000000000 -0800
@@ -155,10 +155,10 @@
 
 static inline void cpuset_track_online_nodes(void) {}
 
-static inline void cpuset_update_dirty_nodes(struct address_space *mapping,
+static inline void cpuset_update_dirty_nodes(struct inode *i,
 		struct page *page) {}
 
-static inline void cpuset_clear_dirty_nodes(struct address_space *mapping) {}
+static inline void cpuset_clear_dirty_nodes(struct inode *i) {}
 
 #endif /* !CONFIG_CPUSETS */
 
Index: linux-2.6.20-rc4-mm1/fs/nfs/inode.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/fs/nfs/inode.c	2007-01-12 13:35:01.000000000 -0800
+++ linux-2.6.20-rc4-mm1/fs/nfs/inode.c	2007-01-12 13:35:26.000000000 -0800
@@ -1132,7 +1132,8 @@
 static int __init nfs_init_inodecache(void)
 {
 	nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",
-					     sizeof(struct nfs_inode),
+					     sizeof(struct nfs_inode)
+					     - unused_numa_node_bytes,
 					     0, (SLAB_RECLAIM_ACCOUNT|
 						SLAB_MEM_SPREAD),
 					     init_once, NULL);