diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-15 09:36:35 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-15 09:36:35 +1000 |
| commit | fdd3a2ae2e48310491e605c46201c95629dd450b (patch) | |
| tree | 2a9361017d5fad1b39e77b8bb5eb1fd45cea0597 /fs/xfs/xfs_bmap.c | |
| parent | ee4eec478be4677b93775d17bc079efb5922b276 (diff) | |
| parent | 5e06d148949bb79af429c46afb4b81bc31308f6e (diff) | |
| download | op-kernel-dev-fdd3a2ae2e48310491e605c46201c95629dd450b.zip op-kernel-dev-fdd3a2ae2e48310491e605c46201c95629dd450b.tar.gz | |
Merge branch 'xfs-unused-args-cleanup' into for-next
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index f0efc7e..37b8d3c 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -94,7 +94,7 @@ xfs_bmap_compute_maxlevels( maxleafents = MAXAEXTNUM; sz = XFS_BMDR_SPACE_CALC(MINABTPTRS); } - maxrootrecs = xfs_bmdr_maxrecs(mp, sz, 0); + maxrootrecs = xfs_bmdr_maxrecs(sz, 0); minleafrecs = mp->m_bmap_dmnr[0]; minnoderecs = mp->m_bmap_dmnr[1]; maxblocks = (maxleafents + minleafrecs - 1) / minleafrecs; @@ -233,7 +233,6 @@ xfs_default_attroffset( */ STATIC void xfs_bmap_forkoff_reset( - xfs_mount_t *mp, xfs_inode_t *ip, int whichfork) { @@ -905,7 +904,7 @@ xfs_bmap_local_to_extents_empty( ASSERT(ifp->if_bytes == 0); ASSERT(XFS_IFORK_NEXTENTS(ip, whichfork) == 0); - xfs_bmap_forkoff_reset(ip->i_mount, ip, whichfork); + xfs_bmap_forkoff_reset(ip, whichfork); ifp->if_flags &= ~XFS_IFINLINE; ifp->if_flags |= XFS_IFEXTENTS; XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS); @@ -1675,7 +1674,6 @@ xfs_bmap_isaeof( */ int xfs_bmap_last_offset( - struct xfs_trans *tp, struct xfs_inode *ip, xfs_fileoff_t *last_block, int whichfork) |
