diff options
Diffstat (limited to 'fs/xfs/xfs_da_btree.c')
-rw-r--r-- | fs/xfs/xfs_da_btree.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c index 731f1f41eca1..2adfb761ab13 100644 --- a/fs/xfs/xfs_da_btree.c +++ b/fs/xfs/xfs_da_btree.c | |||
@@ -1596,7 +1596,7 @@ xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno) | |||
1596 | xfs_bmapi_aflag(w)|XFS_BMAPI_WRITE|XFS_BMAPI_METADATA| | 1596 | xfs_bmapi_aflag(w)|XFS_BMAPI_WRITE|XFS_BMAPI_METADATA| |
1597 | XFS_BMAPI_CONTIG, | 1597 | XFS_BMAPI_CONTIG, |
1598 | args->firstblock, args->total, &map, &nmap, | 1598 | args->firstblock, args->total, &map, &nmap, |
1599 | args->flist, NULL))) { | 1599 | args->flist))) { |
1600 | return error; | 1600 | return error; |
1601 | } | 1601 | } |
1602 | ASSERT(nmap <= 1); | 1602 | ASSERT(nmap <= 1); |
@@ -1617,8 +1617,7 @@ xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno) | |||
1617 | xfs_bmapi_aflag(w)|XFS_BMAPI_WRITE| | 1617 | xfs_bmapi_aflag(w)|XFS_BMAPI_WRITE| |
1618 | XFS_BMAPI_METADATA, | 1618 | XFS_BMAPI_METADATA, |
1619 | args->firstblock, args->total, | 1619 | args->firstblock, args->total, |
1620 | &mapp[mapi], &nmap, args->flist, | 1620 | &mapp[mapi], &nmap, args->flist))) { |
1621 | NULL))) { | ||
1622 | kmem_free(mapp); | 1621 | kmem_free(mapp); |
1623 | return error; | 1622 | return error; |
1624 | } | 1623 | } |
@@ -1879,7 +1878,7 @@ xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno, | |||
1879 | */ | 1878 | */ |
1880 | if ((error = xfs_bunmapi(tp, dp, dead_blkno, count, | 1879 | if ((error = xfs_bunmapi(tp, dp, dead_blkno, count, |
1881 | xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA, | 1880 | xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA, |
1882 | 0, args->firstblock, args->flist, NULL, | 1881 | 0, args->firstblock, args->flist, |
1883 | &done)) == ENOSPC) { | 1882 | &done)) == ENOSPC) { |
1884 | if (w != XFS_DATA_FORK) | 1883 | if (w != XFS_DATA_FORK) |
1885 | break; | 1884 | break; |
@@ -1984,7 +1983,7 @@ xfs_da_do_buf( | |||
1984 | nfsb, | 1983 | nfsb, |
1985 | XFS_BMAPI_METADATA | | 1984 | XFS_BMAPI_METADATA | |
1986 | xfs_bmapi_aflag(whichfork), | 1985 | xfs_bmapi_aflag(whichfork), |
1987 | NULL, 0, mapp, &nmap, NULL, NULL))) | 1986 | NULL, 0, mapp, &nmap, NULL))) |
1988 | goto exit0; | 1987 | goto exit0; |
1989 | } | 1988 | } |
1990 | } else { | 1989 | } else { |