xfs
[Top] [All Lists]

[PATCH 5/9] xfs: do not use unchecked extent indices in xfs_bmapi

To: xfs@xxxxxxxxxxx
Subject: [PATCH 5/9] xfs: do not use unchecked extent indices in xfs_bmapi
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Wed, 11 May 2011 11:04:07 -0400
References: <20110511150402.258164661@xxxxxxxxxxxxxxxxxxxxxx>
User-agent: quilt/0.48-1
Make sure to only call xfs_iext_get_ext after we've validate the extent index
when moving on to the next index in xfs_bmapi.

Based on an earlier patch from Lachlan McIlroy.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: xfs/fs/xfs/xfs_bmap.c
===================================================================
--- xfs.orig/fs/xfs/xfs_bmap.c  2011-05-11 10:16:58.831733512 +0200
+++ xfs/fs/xfs/xfs_bmap.c       2011-05-11 10:16:58.847733078 +0200
@@ -4827,12 +4827,13 @@ xfs_bmapi(
                /*
                 * Else go on to the next record.
                 */
-               ep = xfs_iext_get_ext(ifp, ++lastx);
                prev = got;
-               if (lastx >= nextents)
-                       eof = 1;
-               else
+               if (++lastx < nextents) {
+                       ep = xfs_iext_get_ext(ifp, lastx);
                        xfs_bmbt_get_all(ep, &got);
+               } else {
+                       eof = 1;
+               }
        }
        *nmap = n;
        /*

<Prev in Thread] Current Thread [Next in Thread>