diff options
| author | Brian Foster <bfoster@redhat.com> | 2013-01-17 19:11:29 +0100 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-01-18 00:53:37 +0100 |
| commit | 9e96fe6df44425b69ed89f6ac20352cec1f127d7 (patch) | |
| tree | 875ad09d40b65530fe61c6dbf7b97c3c8b70f995 /fs/xfs | |
| parent | xfs: Remove boolean_t typedef completely. (diff) | |
| download | linux-9e96fe6df44425b69ed89f6ac20352cec1f127d7.tar.xz linux-9e96fe6df44425b69ed89f6ac20352cec1f127d7.zip | |
xfs: pull up stack_switch check into xfs_bmapi_write
The stack_switch check currently occurs in __xfs_bmapi_allocate,
which means the stack switch only occurs when xfs_bmapi_allocate()
is called in a loop. Pull the check up before the loop in
xfs_bmapi_write() such that the first iteration of the loop has
consistent behavior.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index c5077208e419..491f35e2dd26 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -4676,9 +4676,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; @@ -4952,6 +4949,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); |