forked from mirrors/linux
		
	xfs: simplify extent lookup in xfs_can_free_eofblocks
xfs_can_free_eofblocks just cares if there is an extent beyond EOF. Replace the call to xfs_bmapi_read with a xfs_iext_lookup_extent as we've already checked that extents are read in earlier. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
This commit is contained in:
		
							parent
							
								
									b717089efe
								
							
						
					
					
						commit
						11f4c3a53a
					
				
					 1 changed files with 7 additions and 15 deletions
				
			
		| 
						 | 
					@ -492,12 +492,12 @@ bool
 | 
				
			||||||
xfs_can_free_eofblocks(
 | 
					xfs_can_free_eofblocks(
 | 
				
			||||||
	struct xfs_inode	*ip)
 | 
						struct xfs_inode	*ip)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct xfs_bmbt_irec	imap;
 | 
					 | 
				
			||||||
	struct xfs_mount	*mp = ip->i_mount;
 | 
						struct xfs_mount	*mp = ip->i_mount;
 | 
				
			||||||
 | 
						bool			found_blocks = false;
 | 
				
			||||||
	xfs_fileoff_t		end_fsb;
 | 
						xfs_fileoff_t		end_fsb;
 | 
				
			||||||
	xfs_fileoff_t		last_fsb;
 | 
						xfs_fileoff_t		last_fsb;
 | 
				
			||||||
	int			nimaps = 1;
 | 
						struct xfs_bmbt_irec	imap;
 | 
				
			||||||
	int			error;
 | 
						struct xfs_iext_cursor	icur;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
	 * Caller must either hold the exclusive io lock; or be inactivating
 | 
						 * Caller must either hold the exclusive io lock; or be inactivating
 | 
				
			||||||
| 
						 | 
					@ -544,21 +544,13 @@ xfs_can_free_eofblocks(
 | 
				
			||||||
		return false;
 | 
							return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
	 * Look up the mapping for the first block past EOF.  If we can't find
 | 
						 * Check if there is an post-EOF extent to free.
 | 
				
			||||||
	 * it, there's nothing to free.
 | 
					 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
	xfs_ilock(ip, XFS_ILOCK_SHARED);
 | 
						xfs_ilock(ip, XFS_ILOCK_SHARED);
 | 
				
			||||||
	error = xfs_bmapi_read(ip, end_fsb, last_fsb - end_fsb, &imap, &nimaps,
 | 
						if (xfs_iext_lookup_extent(ip, &ip->i_df, end_fsb, &icur, &imap))
 | 
				
			||||||
			0);
 | 
							found_blocks = true;
 | 
				
			||||||
	xfs_iunlock(ip, XFS_ILOCK_SHARED);
 | 
						xfs_iunlock(ip, XFS_ILOCK_SHARED);
 | 
				
			||||||
	if (error || nimaps == 0)
 | 
						return found_blocks;
 | 
				
			||||||
		return false;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	/*
 | 
					 | 
				
			||||||
	 * If there's a real mapping there or there are delayed allocation
 | 
					 | 
				
			||||||
	 * reservations, then we have post-EOF blocks to try to free.
 | 
					 | 
				
			||||||
	 */
 | 
					 | 
				
			||||||
	return imap.br_startblock != HOLESTARTBLOCK || ip->i_delayed_blks;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue