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;
 }
 
 /*