[XFS] Fix up highmem build and error handling on inode shrink register.

SGI Modid: xfs-linux:xfs-kern:173764a
Signed-off-by: nathans@sgi.com

fs/xfs/linux-2.6/kmem.c

@@ -33,6 +33,7 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <linux/highmem.h>
 #include <linux/swap.h>
 
 #include "time.h"

fs/xfs/linux-2.6/xfs_super.c

@@ -852,6 +852,10 @@ init_xfs_fs( void )
 	vfs_initquota();
 
 	xfs_inode_shaker = kmem_shake_register(xfs_inode_shake);
+	if (!xfs_inode_shaker) {
+		error = -ENOMEM;
+		goto undo_shaker;
+	}
 
 	error = register_filesystem(&xfs_fs_type);
 	if (error)
@@ -860,6 +864,9 @@ init_xfs_fs( void )
 	return 0;
 
 undo_register:
+	kmem_shake_deregister(xfs_inode_shaker);
+
+undo_shaker:
 	pagebuf_terminate();
 
 undo_pagebuf: