From b07538c0c6ef2f93638acbcc1cbc0310c56f1afa Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 18 Sep 2011 20:40:43 +0000 Subject: [PATCH] --- yaml --- r: 269886 b: refs/heads/master c: ecee76ba9d91fdcbdff933ca1bd41465ca4c4fdb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_bmap.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1ddb9bb38b45..baa25f16717e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9b984d7846e37c57e5b3f8cd883ad45e8ebc2cf +refs/heads/master: ecee76ba9d91fdcbdff933ca1bd41465ca4c4fdb diff --git a/trunk/fs/xfs/xfs_bmap.c b/trunk/fs/xfs/xfs_bmap.c index ebcd38b14830..05d38adbb85e 100644 --- a/trunk/fs/xfs/xfs_bmap.c +++ b/trunk/fs/xfs/xfs_bmap.c @@ -4294,7 +4294,6 @@ xfs_bmapi( xfs_mount_t *mp; /* xfs mount structure */ int n; /* current extent index */ 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_bmbt_irec_t prev; /* previous file extent record */ int tmp_logflags; /* temp flags holder */ @@ -4380,7 +4379,6 @@ xfs_bmapi( goto error0; ep = xfs_bmap_search_extents(ip, bno, whichfork, &eof, &lastx, &got, &prev); - nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); n = 0; end = bno + len; obno = bno; @@ -4622,7 +4620,6 @@ xfs_bmapi( if (error) goto error0; ep = xfs_iext_get_ext(ifp, lastx); - nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); xfs_bmbt_get_all(ep, &got); ASSERT(got.br_startoff <= aoff); ASSERT(got.br_startoff + got.br_blockcount >= @@ -4723,7 +4720,6 @@ xfs_bmapi( if (error) goto error0; ep = xfs_iext_get_ext(ifp, lastx); - nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); xfs_bmbt_get_all(ep, &got); /* * We may have combined previously unwritten @@ -4781,7 +4777,7 @@ xfs_bmapi( * Else go on to the next record. */ prev = got; - if (++lastx < nextents) { + if (++lastx < ifp->if_bytes / sizeof(xfs_bmbt_rec_t)) { ep = xfs_iext_get_ext(ifp, lastx); xfs_bmbt_get_all(ep, &got); } else {