renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

xfs: remove the nextents variable in xfs_bmapi

Browse Source 
Instead of using a local variable that needs to updated when we modify
the extent map just check ifp->if_bytes directly where we use it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Christoph Hellwig 2011-09-18 20:40:43 +00:00 committed by Alex Elder
parent b9b984d784
commit ecee76ba9d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/xfs_bmap.c
View File

@ -4294,7 +4294,6 @@ xfs_bmapi(
xfs_mount_t *mp; /* xfs mount structure */ xfs_mount_t *mp; /* xfs mount structure */
int n; /* current extent index */ int n; /* current extent index */
int nallocs; /* number of extents alloc'd */ int nallocs; /* number of extents alloc'd */
xfs_extnum_t nextents; /* number of extents in file */
xfs_fileoff_t obno; /* old block number (offset) */ xfs_fileoff_t obno; /* old block number (offset) */
xfs_bmbt_irec_t prev; /* previous file extent record */ xfs_bmbt_irec_t prev; /* previous file extent record */
int tmp_logflags; /* temp flags holder */ int tmp_logflags; /* temp flags holder */
@ -4380,7 +4379,6 @@ xfs_bmapi(
goto error0; goto error0;
ep = xfs_bmap_search_extents(ip, bno, whichfork, &eof, &lastx, &got, ep = xfs_bmap_search_extents(ip, bno, whichfork, &eof, &lastx, &got,
&prev); &prev);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
n = 0; n = 0;
end = bno + len; end = bno + len;
obno = bno; obno = bno;
@ -4622,7 +4620,6 @@ xfs_bmapi(
if (error) if (error)
goto error0; goto error0;
ep = xfs_iext_get_ext(ifp, lastx); ep = xfs_iext_get_ext(ifp, lastx);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
ASSERT(got.br_startoff <= aoff); ASSERT(got.br_startoff <= aoff);
ASSERT(got.br_startoff + got.br_blockcount >= ASSERT(got.br_startoff + got.br_blockcount >=
@ -4723,7 +4720,6 @@ xfs_bmapi(
if (error) if (error)
goto error0; goto error0;
ep = xfs_iext_get_ext(ifp, lastx); ep = xfs_iext_get_ext(ifp, lastx);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
/* /*
* We may have combined previously unwritten * We may have combined previously unwritten
@ -4781,7 +4777,7 @@ xfs_bmapi(
* Else go on to the next record. * Else go on to the next record.
*/ */
prev = got; prev = got;
if (++lastx < nextents) { if (++lastx < ifp->if_bytes / sizeof(xfs_bmbt_rec_t)) {
ep = xfs_iext_get_ext(ifp, lastx); ep = xfs_iext_get_ext(ifp, lastx);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
} else { } else {