From 90d02eafaf53556b74115cf3f3b467b1a2415199 Mon Sep 17 00:00:00 2001
From: Brian Foster <bfoster@redhat.com>
Date: Thu, 17 Jan 2013 13:11:29 -0500
Subject: [PATCH] --- yaml --- r: 349347 b: refs/heads/master c:
 d26978dd866dbb3b3a9690f3655a5e735055de89 h: refs/heads/master i:   349345:
 6bc721cc139c6189a1b708cf1752039d3ba3b4dc   349343:
 c4cf135b00aafc1bbb1a03f05390b9d34c6084b2 v: v3

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

diff --git a/[refs] b/[refs]
index bdd2b8e25981..fc49e81971e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bee12b8c44d825fb45cd6a13e76c185ed6888b8
+refs/heads/master: d26978dd866dbb3b3a9690f3655a5e735055de89
diff --git a/trunk/fs/xfs/xfs_bmap.c b/trunk/fs/xfs/xfs_bmap.c
index 0e92d12765d2..cdb2d3348583 100644
--- a/trunk/fs/xfs/xfs_bmap.c
+++ b/trunk/fs/xfs/xfs_bmap.c
@@ -4680,9 +4680,6 @@ __xfs_bmapi_allocate(
 			return error;
 	}
 
-	if (bma->flags & XFS_BMAPI_STACK_SWITCH)
-		bma->stack_switch = 1;
-
 	error = xfs_bmap_alloc(bma);
 	if (error)
 		return error;
@@ -4956,6 +4953,9 @@ xfs_bmapi_write(
 	bma.flist = flist;
 	bma.firstblock = firstblock;
 
+	if (flags & XFS_BMAPI_STACK_SWITCH)
+		bma.stack_switch = 1;
+
 	while (bno < end && n < *nmap) {
 		inhole = eof || bma.got.br_startoff > bno;
 		wasdelay = !inhole && isnullstartblock(bma.got.br_startblock);