PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: limit xfs_imap_to_bmap to a single mapping

Browse Source 
We only call xfs_iomap for single mappings anyway, so remove all
code dealing with multiple mappings from xfs_imap_to_bmap and add
asserts that we never get results that we do not expect.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Christoph Hellwig 2010-04-28 12:28:51 +00:00 committed by Alex Elder
parent 4a5224d7b1
commit 826bf0adce
1 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
fs/xfs/xfs_iomap.c
View File

@ -55,49 +55,41 @@
#define XFS_STRAT_WRITE_IMAPS 2 #define XFS_STRAT_WRITE_IMAPS 2
#define XFS_WRITE_IMAPS XFS_BMAP_MAX_NMAP #define XFS_WRITE_IMAPS XFS_BMAP_MAX_NMAP
STATIC int STATIC void
xfs_imap_to_bmap( xfs_imap_to_bmap(
xfs_inode_t *ip, xfs_inode_t *ip,
xfs_off_t offset, xfs_off_t offset,
xfs_bmbt_irec_t *imap, xfs_bmbt_irec_t *imap,
xfs_iomap_t *iomapp, xfs_iomap_t *iomapp,
int imaps, /* Number of imap entries */ int imaps, /* Number of imap entries */
int iomaps, /* Number of iomap entries */
int flags) int flags)
{ {
xfs_mount_t *mp = ip->i_mount; xfs_mount_t *mp = ip->i_mount;
int pbm;
xfs_fsblock_t start_block; xfs_fsblock_t start_block;
iomapp->iomap_offset = XFS_FSB_TO_B(mp, imap->br_startoff);
iomapp->iomap_delta = offset - iomapp->iomap_offset;
iomapp->iomap_bsize = XFS_FSB_TO_B(mp, imap->br_blockcount);
iomapp->iomap_flags = flags;
for (pbm = 0; imaps && pbm < iomaps; imaps--, iomapp++, imap++, pbm++) { if (XFS_IS_REALTIME_INODE(ip)) {
iomapp->iomap_offset = XFS_FSB_TO_B(mp, imap->br_startoff); iomapp->iomap_flags |= IOMAP_REALTIME;
iomapp->iomap_delta = offset - iomapp->iomap_offset; iomapp->iomap_target = mp->m_rtdev_targp;
iomapp->iomap_bsize = XFS_FSB_TO_B(mp, imap->br_blockcount); } else {
iomapp->iomap_flags = flags; iomapp->iomap_target = mp->m_ddev_targp;
}
if (XFS_IS_REALTIME_INODE(ip)) { start_block = imap->br_startblock;
iomapp->iomap_flags |= IOMAP_REALTIME; if (start_block == HOLESTARTBLOCK) {
iomapp->iomap_target = mp->m_rtdev_targp; iomapp->iomap_bn = IOMAP_DADDR_NULL;
} else { iomapp->iomap_flags |= IOMAP_HOLE;
iomapp->iomap_target = mp->m_ddev_targp; } else if (start_block == DELAYSTARTBLOCK) {
} iomapp->iomap_bn = IOMAP_DADDR_NULL;
start_block = imap->br_startblock; iomapp->iomap_flags |= IOMAP_DELAY;
if (start_block == HOLESTARTBLOCK) { } else {
iomapp->iomap_bn = IOMAP_DADDR_NULL; iomapp->iomap_bn = xfs_fsb_to_db(ip, start_block);
iomapp->iomap_flags |= IOMAP_HOLE; if (ISUNWRITTEN(imap))
} else if (start_block == DELAYSTARTBLOCK) { iomapp->iomap_flags |= IOMAP_UNWRITTEN;
iomapp->iomap_bn = IOMAP_DADDR_NULL;
iomapp->iomap_flags |= IOMAP_DELAY;
} else {
iomapp->iomap_bn = xfs_fsb_to_db(ip, start_block);
if (ISUNWRITTEN(imap))
iomapp->iomap_flags |= IOMAP_UNWRITTEN;
}
offset += iomapp->iomap_bsize - iomapp->iomap_delta;
} }
return pbm; /* Return the number filled */
} }
int int
@ -119,6 +111,7 @@ xfs_iomap(
int iomap_flags = 0; int iomap_flags = 0;
ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFREG); ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFREG);
ASSERT(niomaps && *niomaps == 1);
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
@ -203,12 +196,11 @@ xfs_iomap(
break; break;
} }
if (nimaps) { ASSERT(nimaps <= 1);
*niomaps = xfs_imap_to_bmap(ip, offset, &imap,
iomapp, nimaps, *niomaps, iomap_flags); if (nimaps)
} else if (niomaps) { xfs_imap_to_bmap(ip, offset, &imap, iomapp, nimaps, iomap_flags);
*niomaps = 0; *niomaps = nimaps;
}
out: out:
if (lockmode) if (lockmode)