lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] fix uninitialised variable bug in dquot release

Browse Source 
gcc on ARM warns about an using an uninitialised variable
in xfs_qm_dqrele_all_inodes(). This is a real bug, but gcc
on x86_64 is not reporting this warning so it went unnoticed.

Fix the bug by bring the inode radix tree walk code up to
date with xfs_sync_inodes_ag().

SGI-PV: 987246

Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Dave Chinner
2008-11-10 17:11:18 +11:00
committed by Lachlan McIlroy
parent d44dab8d1c
commit cb4f0d1d42
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
fs/xfs/quota/xfs_qm_syscalls.c
View File

@@ -1036,9 +1036,6 @@ xfs_qm_dqrele_inodes_ag(
int nr_found; int nr_found;
do { do {
boolean_t inode_refed;
struct inode *inode;
/* /*
* use a gang lookup to find the next inode in the tree * use a gang lookup to find the next inode in the tree
* as the tree is sparse and a gang lookup walks to find * as the tree is sparse and a gang lookup walks to find
@@ -1053,27 +1050,37 @@ xfs_qm_dqrele_inodes_ag(
break; break;
} }
/* update the index for the next lookup */ /*
* Update the index for the next lookup. Catch overflows
* into the next AG range which can occur if we have inodes
* in the last block of the AG and we are currently
* pointing to the last inode.
*/
first_index = XFS_INO_TO_AGINO(mp, ip->i_ino + 1); first_index = XFS_INO_TO_AGINO(mp, ip->i_ino + 1);
if (first_index < XFS_INO_TO_AGINO(mp, ip->i_ino)) {
read_unlock(&pag->pag_ici_lock);
break;
}
/* skip quota inodes and those in reclaim */ /* skip quota inodes */
inode = VFS_I(ip); if (ip == XFS_QI_UQIP(mp) || ip == XFS_QI_GQIP(mp)) {
if (!inode || ip == XFS_QI_UQIP(mp) || ip == XFS_QI_GQIP(mp)) {
ASSERT(ip->i_udquot == NULL); ASSERT(ip->i_udquot == NULL);
ASSERT(ip->i_gdquot == NULL); ASSERT(ip->i_gdquot == NULL);
read_unlock(&pag->pag_ici_lock); read_unlock(&pag->pag_ici_lock);
continue; continue;
} }
if (xfs_ilock_nowait(ip, XFS_ILOCK_EXCL) == 0) {
inode = igrab(inode); /*
read_unlock(&pag->pag_ici_lock); * If we can't get a reference on the inode, it must be
if (!inode) * in reclaim. Leave it for the reclaim code to flush.
continue; */
inode_refed = B_TRUE; if (!igrab(VFS_I(ip))) {
xfs_ilock(ip, XFS_ILOCK_EXCL);
} else {
read_unlock(&pag->pag_ici_lock); read_unlock(&pag->pag_ici_lock);
continue;
} }
read_unlock(&pag->pag_ici_lock);
xfs_ilock(ip, XFS_ILOCK_EXCL);
if ((flags & XFS_UQUOTA_ACCT) && ip->i_udquot) { if ((flags & XFS_UQUOTA_ACCT) && ip->i_udquot) {
xfs_qm_dqrele(ip->i_udquot); xfs_qm_dqrele(ip->i_udquot);
ip->i_udquot = NULL; ip->i_udquot = NULL;
@@ -1083,9 +1090,8 @@ xfs_qm_dqrele_inodes_ag(
xfs_qm_dqrele(ip->i_gdquot); xfs_qm_dqrele(ip->i_gdquot);
ip->i_gdquot = NULL; ip->i_gdquot = NULL;
} }
xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iput(ip, XFS_ILOCK_EXCL);
if (inode_refed)
IRELE(ip);
} while (nr_found); } while (nr_found);
} }