diff options
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 17 | 
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index a1aab9275d5..a84d0c30b48 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -422,8 +422,7 @@ xfs_bmap_add_attrfork_btree(  	if (ip->i_df.if_broot_bytes <= XFS_IFORK_DSIZE(ip))  		*flags |= XFS_ILOG_DBROOT;  	else { -		cur = xfs_btree_init_cursor(mp, tp, NULL, 0, XFS_BTNUM_BMAP, ip, -			XFS_DATA_FORK); +		cur = xfs_bmbt_init_cursor(mp, tp, ip, XFS_DATA_FORK);  		cur->bc_private.b.flist = flist;  		cur->bc_private.b.firstblock = *firstblock;  		if ((error = xfs_bmbt_lookup_ge(cur, 0, 0, 0, &stat))) @@ -3441,8 +3440,7 @@ xfs_bmap_extents_to_btree(  	 * Need a cursor.  Can't allocate until bb_level is filled in.  	 */  	mp = ip->i_mount; -	cur = xfs_btree_init_cursor(mp, tp, NULL, 0, XFS_BTNUM_BMAP, ip, -		whichfork); +	cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);  	cur->bc_private.b.firstblock = *firstblock;  	cur->bc_private.b.flist = flist;  	cur->bc_private.b.flags = wasdel ? XFS_BTCUR_BPRV_WASDEL : 0; @@ -5029,8 +5027,7 @@ xfs_bmapi(  				if (abno == NULLFSBLOCK)  					break;  				if ((ifp->if_flags & XFS_IFBROOT) && !cur) { -					cur = xfs_btree_init_cursor(mp, -						tp, NULL, 0, XFS_BTNUM_BMAP, +					cur = xfs_bmbt_init_cursor(mp, tp,  						ip, whichfork);  					cur->bc_private.b.firstblock =  						*firstblock; @@ -5147,9 +5144,8 @@ xfs_bmapi(  			 */  			ASSERT(mval->br_blockcount <= len);  			if ((ifp->if_flags & XFS_IFBROOT) && !cur) { -				cur = xfs_btree_init_cursor(mp, -					tp, NULL, 0, XFS_BTNUM_BMAP, -					ip, whichfork); +				cur = xfs_bmbt_init_cursor(mp, +					tp, ip, whichfork);  				cur->bc_private.b.firstblock =  					*firstblock;  				cur->bc_private.b.flist = flist; @@ -5440,8 +5436,7 @@ xfs_bunmapi(  	logflags = 0;  	if (ifp->if_flags & XFS_IFBROOT) {  		ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE); -		cur = xfs_btree_init_cursor(mp, tp, NULL, 0, XFS_BTNUM_BMAP, ip, -			whichfork); +		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);  		cur->bc_private.b.firstblock = *firstblock;  		cur->bc_private.b.flist = flist;  		cur->bc_private.b.flags = 0;  |