On Tue, Nov 04, 2014 at 11:53:16PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> The bulkstat code has several different ways of detecting the end of
> an AG when doing a walk. They are not consistently detected, and the
> code that checks for the end of AG conditions is not consistently
> coded. Hence the are conditions where the walk code can get stuck in
> an endless loop making no progress and not triggering any
> termination conditions.
>
> Convert all the "tmp/i" status return codes from btree operations
> to a common name (stat) and apply end-of-ag detection to these
> operations consistently.
>
> cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---
Looks Ok...
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_itable.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
> index 7765ff7..16737cb 100644
> --- a/fs/xfs/xfs_itable.c
> +++ b/fs/xfs/xfs_itable.c
> @@ -356,7 +356,6 @@ xfs_bulkstat(
> int end_of_ag; /* set if we've seen the ag end */
> int error; /* error code */
> int fmterror;/* bulkstat formatter result */
> - int i; /* loop index */
> int icount; /* count of inodes good in irbuf */
> size_t irbsize; /* size of irec buffer in bytes */
> xfs_ino_t ino; /* inode number (filesystem) */
> @@ -366,11 +365,11 @@ xfs_bulkstat(
> xfs_ino_t lastino; /* last inode number returned */
> int nirbuf; /* size of irbuf */
> int rval; /* return value error code */
> - int tmp; /* result value from btree calls */
> int ubcount; /* size of user's buffer */
> int ubleft; /* bytes left in user's buffer */
> char __user *ubufp; /* pointer into user's buffer */
> int ubelem; /* spaces used in user's buffer */
> + int stat;
>
> /*
> * Get the last inode value, see if there's nothing to do.
> @@ -436,13 +435,15 @@ xfs_bulkstat(
> agino = r.ir_startino + XFS_INODES_PER_CHUNK;
> }
> /* Increment to the next record */
> - error = xfs_btree_increment(cur, 0, &tmp);
> + error = xfs_btree_increment(cur, 0, &stat);
> } else {
> /* Start of ag. Lookup the first inode chunk */
> - error = xfs_inobt_lookup(cur, 0, XFS_LOOKUP_GE, &tmp);
> + error = xfs_inobt_lookup(cur, 0, XFS_LOOKUP_GE, &stat);
> }
> - if (error)
> + if (error || stat == 0) {
> + end_of_ag = 1;
> goto del_cursor;
> + }
>
> /*
> * Loop through inode btree records in this ag,
> @@ -451,8 +452,8 @@ xfs_bulkstat(
> while (irbp < irbufend && icount < ubcount) {
> struct xfs_inobt_rec_incore r;
>
> - error = xfs_inobt_get_rec(cur, &r, &i);
> - if (error || i == 0) {
> + error = xfs_inobt_get_rec(cur, &r, &stat);
> + if (error || stat == 0) {
> end_of_ag = 1;
> goto del_cursor;
> }
> @@ -473,8 +474,8 @@ xfs_bulkstat(
> * Set agino to after this chunk and bump the cursor.
> */
> agino = r.ir_startino + XFS_INODES_PER_CHUNK;
> - error = xfs_btree_increment(cur, 0, &tmp);
> - if (error) {
> + error = xfs_btree_increment(cur, 0, &stat);
> + if (error || stat == 0) {
> end_of_ag = 1;
> goto del_cursor;
> }
> --
> 2.0.0
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
