openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: bulkstat btree walk doesn't terminate 

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@vger.kernel.org> # 3.17
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner 2014-11-07 08:29:57 +11:00 committed by Dave Chinner
parent 77783d0642
commit afa947cb52
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/xfs/xfs_itable.c
View File

@ -356,7 +356,6 @@ xfs_bulkstat(
int end_of_ag; /* set if we've seen the ag end */ int end_of_ag; /* set if we've seen the ag end */
int error; /* error code */ int error; /* error code */
int fmterror;/* bulkstat formatter result */ int fmterror;/* bulkstat formatter result */
int i; /* loop index */
int icount; /* count of inodes good in irbuf */ int icount; /* count of inodes good in irbuf */
size_t irbsize; /* size of irec buffer in bytes */ size_t irbsize; /* size of irec buffer in bytes */
xfs_ino_t ino; /* inode number (filesystem) */ xfs_ino_t ino; /* inode number (filesystem) */
@ -366,11 +365,11 @@ xfs_bulkstat(
xfs_ino_t lastino; /* last inode number returned */ xfs_ino_t lastino; /* last inode number returned */
int nirbuf; /* size of irbuf */ int nirbuf; /* size of irbuf */
int rval; /* return value error code */ int rval; /* return value error code */
int tmp; /* result value from btree calls */
int ubcount; /* size of user's buffer */ int ubcount; /* size of user's buffer */
int ubleft; /* bytes left in user's buffer */ int ubleft; /* bytes left in user's buffer */
char __user *ubufp; /* pointer into user's buffer */ char __user *ubufp; /* pointer into user's buffer */
int ubelem; /* spaces used in 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. * 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; agino = r.ir_startino + XFS_INODES_PER_CHUNK;
} }
/* Increment to the next record */ /* Increment to the next record */
error = xfs_btree_increment(cur, 0, &tmp); error = xfs_btree_increment(cur, 0, &stat);
} else { } else {
/* Start of ag. Lookup the first inode chunk */ /* 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; goto del_cursor;
}
/* /*
* Loop through inode btree records in this ag, * Loop through inode btree records in this ag,
@ -451,8 +452,8 @@ xfs_bulkstat(
while (irbp < irbufend && icount < ubcount) { while (irbp < irbufend && icount < ubcount) {
struct xfs_inobt_rec_incore r; struct xfs_inobt_rec_incore r;
error = xfs_inobt_get_rec(cur, &r, &i); error = xfs_inobt_get_rec(cur, &r, &stat);
if (error || i == 0) { if (error || stat == 0) {
end_of_ag = 1; end_of_ag = 1;
goto del_cursor; goto del_cursor;
} }
@ -473,8 +474,8 @@ xfs_bulkstat(
* Set agino to after this chunk and bump the cursor. * Set agino to after this chunk and bump the cursor.
*/ */
agino = r.ir_startino + XFS_INODES_PER_CHUNK; agino = r.ir_startino + XFS_INODES_PER_CHUNK;
error = xfs_btree_increment(cur, 0, &tmp); error = xfs_btree_increment(cur, 0, &stat);
if (error) { if (error || stat == 0) {
end_of_ag = 1; end_of_ag = 1;
goto del_cursor; goto del_cursor;
} }