From 11197663317c41d43701195f0efac77d7eb08bd6 Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Thu, 1 Mar 2012 14:56:28 +0100
Subject: [PATCH] --- yaml --- r: 297863 b: refs/heads/master c:
 538042801a479ebd316582ad10a9c3156b5b7548 h: refs/heads/master i:   297861:
 2cfb481cef6d313f11dd1112d3f7af2be8aa6045   297859:
 ed08fb983cce8a893d7b9124f9ba3b3eacea2609   297855:
 8d5c187d4b6eb3afdfb99e7d82cb48ffbeee408e v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/extent-tree.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 79d3d7aad60f..0c71c5d2438f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5c13f927fe77b11a67f79559808c68b26474c77
+refs/heads/master: 538042801a479ebd316582ad10a9c3156b5b7548
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 37e0a800d34e..c32a9bffe9e4 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -5838,7 +5838,8 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
 			printk(KERN_ERR "btrfs allocation failed flags %llu, "
 			       "wanted %llu\n", (unsigned long long)data,
 			       (unsigned long long)num_bytes);
-			dump_space_info(sinfo, num_bytes, 1);
+			if (sinfo)
+				dump_space_info(sinfo, num_bytes, 1);
 		}
 	}