diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-07-29 11:54:07 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-07-29 11:54:07 +1000 |
| commit | 20b83944361908be78c941e0fb76d508124637ec (patch) | |
| tree | d74c77137af23af21ed767e4a877008444bae754 /fs/xfs/libxfs/xfs_da_btree.c | |
| parent | df150ed102baa0e78c06e08e975dfb47147dd677 (diff) | |
| parent | 1cfc4a9cf89d23727c6678170aa5949a676fc566 (diff) | |
| download | linux-20b83944361908be78c941e0fb76d508124637ec.tar.gz linux-20b83944361908be78c941e0fb76d508124637ec.tar.bz2 linux-20b83944361908be78c941e0fb76d508124637ec.zip | |
Merge branch 'xfs-misc-fixes-for-4.3' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_da_btree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_da_btree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index 2385f8cd08ab..2ae91e89f6b4 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -2351,8 +2351,8 @@ xfs_da_shrink_inode( * the last block to the place we want to kill. */ error = xfs_bunmapi(tp, dp, dead_blkno, count, - xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA, - 0, args->firstblock, args->flist, &done); + xfs_bmapi_aflag(w), 0, args->firstblock, + args->flist, &done); if (error == -ENOSPC) { if (w != XFS_DATA_FORK) break; |