From b05e49a2af8b4fc6f174aabe85d781211673a6e1 Mon Sep 17 00:00:00 2001
From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Fri, 5 Dec 2008 13:16:15 +1100
Subject: [PATCH] --- yaml --- r: 124943 b: refs/heads/master c:
 c6422617a1c0d7787e515748b01f594fe43aea98 h: refs/heads/master i:   124941:
 b6a1a2bedbe9db90eb2a40a7eb4faab8a674cc42   124939:
 d280a69fa552dea2637af88b2a516826d07afa20   124935:
 4c06f21d0e6f45bfb3b41e2afb56378eab6440f0   124927:
 b705b13ea68f6eaf64b3148df179ea14f1d659f9 v: v3

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

diff --git a/[refs] b/[refs]
index eff76eeb10f1..140697a1539e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a0775a991d5597ce98f1e15373288ea133cc793
+refs/heads/master: c6422617a1c0d7787e515748b01f594fe43aea98
diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c
index 2d57aae0e310..4547608b46c4 100644
--- a/trunk/fs/xfs/xfs_vnodeops.c
+++ b/trunk/fs/xfs/xfs_vnodeops.c
@@ -3034,6 +3034,8 @@ xfs_zero_remaining_bytes(
 	bp = xfs_buf_get_noaddr(mp->m_sb.sb_blocksize,
 				XFS_IS_REALTIME_INODE(ip) ?
 				mp->m_rtdev_targp : mp->m_ddev_targp);
+	if (!bp)
+		return XFS_ERROR(ENOMEM);
 
 	for (offset = startoff; offset <= endoff; offset = lastoffset + 1) {
 		offset_fsb = XFS_B_TO_FSBT(mp, offset);