diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c
index ae99a7e232ee..dd74a08e5255 100644
--- a/fs/jfs/jfs_extent.c
+++ b/fs/jfs/jfs_extent.c
@@ -311,7 +311,12 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
 	 * blocks in the map. in that case, we'll start off with the
 	 * maximum free.
 	 */
-	max = (s64) 1 << bmp->db_maxfreebud;
+
+	/* give up if no space left */
+	if (bmp->db_maxfreebud == -1)
+		max = 0;
+	else
+		max = (s64) 1 << bmp->db_maxfreebud;
 	if (*nblocks >= max && *nblocks > nbperpage)
 		nb = nblks = (max > nbperpage) ? max : nbperpage;
 	else
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 2d304cee884c..115b1774964c 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -267,7 +267,7 @@ static int xtSearch(struct inode *ip, s64 xoff,	s64 *nextp,
 		    (p->header.flag & BT_LEAF) &&
 		    (index = jfs_ip->btindex) <
 		    le16_to_cpu(p->header.nextindex)) {
-			xad = &p->xad[index];
+			xad = &p->xad[index - 1];
 			t64 = offsetXAD(xad);
 			if (xoff < t64 + lengthXAD(xad)) {
 				if (xoff >= t64) {