diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-09 08:18:30 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-09 08:18:30 +1100 |
| commit | ab9d1e4f7b0217948a3b35a64178602ab30ff45d (patch) | |
| tree | 49845bb88fdd82fa5baee40b411eec1b8e5b17d9 /fs/xfs/libxfs | |
| parent | 3c1a79f5fff9b5ef653dc8b900ce818860c1f710 (diff) | |
| parent | a5fd276bdc4fb71b06d100a6abc77ad682f77de4 (diff) | |
| download | linux-stable-ab9d1e4f7b0217948a3b35a64178602ab30ff45d.tar.gz linux-stable-ab9d1e4f7b0217948a3b35a64178602ab30ff45d.tar.bz2 linux-stable-ab9d1e4f7b0217948a3b35a64178602ab30ff45d.zip | |
Merge branch 'xfs-misc-fixes-4.6-3' into for-next
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 5 | ||||
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index cb58d728a4d0..79e898cb5562 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -477,10 +477,7 @@ xfs_bmap_check_leaf_extents( } block = XFS_BUF_TO_BLOCK(bp); } - if (bp_release) { - bp_release = 0; - xfs_trans_brelse(NULL, bp); - } + return; error0: diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 66d702e6b9ff..22297f9b0fd5 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -2403,8 +2403,8 @@ xfs_ialloc_compute_maxlevels( maxleafents = (1LL << XFS_INO_AGINO_BITS(mp)) >> XFS_INODES_PER_CHUNK_LOG; - minleafrecs = mp->m_alloc_mnr[0]; - minnoderecs = mp->m_alloc_mnr[1]; + minleafrecs = mp->m_inobt_mnr[0]; + minnoderecs = mp->m_inobt_mnr[1]; maxblocks = (maxleafents + minleafrecs - 1) / minleafrecs; for (level = 1; maxblocks > 1; level++) maxblocks = (maxblocks + minnoderecs - 1) / minnoderecs; |