--- fs/xfs/quota/xfs_qm_syscalls.c

+++ fs/xfs/quota/xfs_qm_syscalls.c

@@ -266,7 +266,7 @@ xfs_qm_scall_trunc_qfiles(

}

if ((flags & XFS_DQ_USER) && mp->m_sb.sb_uquotino != NULLFSINO) {

- error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, 0, 0, &qip, 0);

+ error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, 0, 0, &qip);

if (!error) {

error = xfs_truncate_file(mp, qip);

IRELE(qip);

@@ -275,7 +275,7 @@ xfs_qm_scall_trunc_qfiles(

if ((flags & (XFS_DQ_GROUP|XFS_DQ_PROJ)) &&

mp->m_sb.sb_gquotino != NULLFSINO) {

- error2 = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, 0, 0, &qip, 0);

+ error2 = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, 0, 0, &qip);

if (!error2) {

error2 = xfs_truncate_file(mp, qip);

IRELE(qip);

@@ -420,12 +420,12 @@ xfs_qm_scall_getqstat(

}

if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {

if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,

- 0, 0, &uip, 0) == 0)

+ 0, 0, &uip) == 0)

tempuqip = B_TRUE;

}

if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) {

if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,

- 0, 0, &gip, 0) == 0)

+ 0, 0, &gip) == 0)

tempgqip = B_TRUE;

}

if (uip) {

@@ -1114,10 +1114,7 @@ xfs_qm_internalqcheck_adjust(

xfs_ino_t ino, /* inode number to get data for */

void __user *buffer, /* not used */

int ubsize, /* not used */

- void *private_data, /* not used */

- xfs_daddr_t bno, /* starting block of inode cluster */

int *ubused, /* not used */

- void *dip, /* not used */

int *res) /* bulkstat result code */

{

xfs_inode_t *ip;

@@ -1139,7 +1136,7 @@ xfs_qm_internalqcheck_adjust(

ipreleased = B_FALSE;

again:

lock_flags = XFS_ILOCK_SHARED;

- if ((error = xfs_iget(mp, NULL, ino, 0, lock_flags, &ip, bno))) {

+ if ((error = xfs_iget(mp, NULL, ino, 0, lock_flags, &ip))) {

*res = BULKSTAT_RV_NOTHING;

return (error);

}

@@ -1212,15 +1209,15 @@ xfs_qm_internalqcheck(

* Iterate thru all the inodes in the file system,

* adjusting the corresponding dquot counters

*/

- if ((error = xfs_bulkstat(mp, &lastino, &count,

- xfs_qm_internalqcheck_adjust, NULL,

- 0, NULL, BULKSTAT_FG_IGET, &done))) {

+ error = xfs_bulkstat(mp, &lastino, &count,

+ xfs_qm_internalqcheck_adjust,

+ 0, NULL, &done);

+ if (error) {

+ cmn_err(CE_DEBUG, "Bulkstat returned error 0x%x", error);

break;

}

- } while (! done);

- if (error) {

- cmn_err(CE_DEBUG, "Bulkstat returned error 0x%x", error);

- }

+ } while (!done);

+

cmn_err(CE_DEBUG, "Checking results against system dquots");

for (i = 0; i < qmtest_hashmask; i++) {

h1 = &qmtest_udqtab[i];