From f686fa8256c1fa742b8c845caa613f7bc15934d7 Mon Sep 17 00:00:00 2001
From: Lachlan McIlroy <lachlan@sgi.com>
Date: Thu, 30 Oct 2008 17:36:52 +1100
Subject: [PATCH] --- yaml --- r: 124843 b: refs/heads/master c:
 493dca6178cf4a6ae2a16c602d6cb455bb7d31bd h: refs/heads/master i:   124841:
 d354cf023428db38db799ce84307d819b21b8240   124839:
 e12423987af2f34d6c88822a010a1087b6dc0abb v: v3

---
 [refs]                             | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_super.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3f6c140c4dfc..5a8987a960c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99fa8cb3c580d4445fe8fc239454e8f37a3b6847
+refs/heads/master: 493dca6178cf4a6ae2a16c602d6cb455bb7d31bd
diff --git a/trunk/fs/xfs/linux-2.6/xfs_super.c b/trunk/fs/xfs/linux-2.6/xfs_super.c
index bb535a7737b5..1d67d7f92a46 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_super.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_super.c
@@ -872,6 +872,7 @@ xfs_fs_alloc_inode(
 	struct super_block	*sb)
 {
 	BUG();
+	return NULL;
 }
 
 /*