From 5993430d5f4bbb026bbfeed2e13d4737baa98ab4 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Wed, 11 May 2011 15:04:07 +0000
Subject: [PATCH] --- yaml --- r: 251771 b: refs/heads/master c:
 5690f92199956c0f2a2d9f718b5031e1300a1de1 h: refs/heads/master i:   251769:
 7b87d1daed946d2dc25067af851188c5bb42a18b   251767:
 c32f281c5af007a57cde04b64688d1a8bf5a2ac8 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/xfs/xfs_bmap.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4fbf6ffd4338..6449724ce591 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f2b3220b0566692da14e06ea5fc0d697a78dc7c
+refs/heads/master: 5690f92199956c0f2a2d9f718b5031e1300a1de1
diff --git a/trunk/fs/xfs/xfs_bmap.c b/trunk/fs/xfs/xfs_bmap.c
index 130ec4fa5eaf..af655c1d460d 100644
--- a/trunk/fs/xfs/xfs_bmap.c
+++ b/trunk/fs/xfs/xfs_bmap.c
@@ -4825,12 +4825,13 @@ xfs_bmapi(
 		/*
 		 * Else go on to the next record.
 		 */
-		ep = xfs_iext_get_ext(ifp, ++lastx);
 		prev = got;
-		if (lastx >= nextents)
-			eof = 1;
-		else
+		if (++lastx < nextents) {
+			ep = xfs_iext_get_ext(ifp, lastx);
 			xfs_bmbt_get_all(ep, &got);
+		} else {
+			eof = 1;
+		}
 	}
 	*nmap = n;
 	/*