Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xfs: Define a new function xfs_is_quota_inode()

Browse source 
In preparation for combined pquota/gquota support, define
a new function to check if the given inode is a quota inode.

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
Chandra Seetharaman 2013-06-27 17:25:04 -05:00 committed by Ben Myers
parent dc037ad7d2
commit 9cad19d2cb
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/xfs_itable.c
View file

@ -43,7 +43,7 @@ xfs_internal_inum(
{ {
return (ino == mp->m_sb.sb_rbmino || ino == mp->m_sb.sb_rsumino || return (ino == mp->m_sb.sb_rbmino || ino == mp->m_sb.sb_rsumino ||
(xfs_sb_version_hasquota(&mp->m_sb) && (xfs_sb_version_hasquota(&mp->m_sb) &&
(ino == mp->m_sb.sb_uquotino || ino == mp->m_sb.sb_gquotino))); xfs_is_quota_inode(&mp->m_sb, ino)));
} }
/* /*

8
fs/xfs/xfs_qm.c
View file

@ -489,8 +489,7 @@ xfs_qm_need_dqattach(
return false; return false;
if (!XFS_NOT_DQATTACHED(mp, ip)) if (!XFS_NOT_DQATTACHED(mp, ip))
return false; return false;
if (ip->i_ino == mp->m_sb.sb_uquotino || if (xfs_is_quota_inode(&mp->m_sb, ip->i_ino))
ip->i_ino == mp->m_sb.sb_gquotino)
return false; return false;
return true; return true;
} }
@ -606,8 +605,7 @@ xfs_qm_dqdetach(
trace_xfs_dquot_dqdetach(ip); trace_xfs_dquot_dqdetach(ip);
ASSERT(ip->i_ino != ip->i_mount->m_sb.sb_uquotino); ASSERT(!xfs_is_quota_inode(&ip->i_mount->m_sb, ip->i_ino));
ASSERT(ip->i_ino != ip->i_mount->m_sb.sb_gquotino);
if (ip->i_udquot) { if (ip->i_udquot) {
xfs_qm_dqrele(ip->i_udquot); xfs_qm_dqrele(ip->i_udquot);
ip->i_udquot = NULL; ip->i_udquot = NULL;
@ -1152,7 +1150,7 @@ xfs_qm_dqusage_adjust(
* rootino must have its resources accounted for, not so with the quota * rootino must have its resources accounted for, not so with the quota
* inodes. * inodes.
*/ */
if (ino == mp->m_sb.sb_uquotino || ino == mp->m_sb.sb_gquotino) { if (xfs_is_quota_inode(&mp->m_sb, ino)) {
*res = BULKSTAT_RV_NOTHING; *res = BULKSTAT_RV_NOTHING;
return XFS_ERROR(EINVAL); return XFS_ERROR(EINVAL);
} }

6
fs/xfs/xfs_sb.h
View file

@ -618,6 +618,12 @@ xfs_sb_has_incompat_log_feature(
return (sbp->sb_features_log_incompat & feature) != 0; return (sbp->sb_features_log_incompat & feature) != 0;
} }
static inline bool
xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
{
return (ino == sbp->sb_uquotino || ino == sbp->sb_gquotino);
}
/* /*
* end of superblock version macros * end of superblock version macros
*/ */

6
fs/xfs/xfs_trans_dquot.c
View file

@ -157,8 +157,7 @@ xfs_trans_mod_dquot_byino(
if (!XFS_IS_QUOTA_RUNNING(mp) || if (!XFS_IS_QUOTA_RUNNING(mp) ||
!XFS_IS_QUOTA_ON(mp) || !XFS_IS_QUOTA_ON(mp) ||
ip->i_ino == mp->m_sb.sb_uquotino || xfs_is_quota_inode(&mp->m_sb, ip->i_ino))
ip->i_ino == mp->m_sb.sb_gquotino)
return; return;
if (tp->t_dqinfo == NULL) if (tp->t_dqinfo == NULL)
@ -816,8 +815,7 @@ xfs_trans_reserve_quota_nblks(
if (XFS_IS_PQUOTA_ON(mp)) if (XFS_IS_PQUOTA_ON(mp))
flags |= XFS_QMOPT_ENOSPC; flags |= XFS_QMOPT_ENOSPC;
ASSERT(ip->i_ino != mp->m_sb.sb_uquotino); ASSERT(!xfs_is_quota_inode(&mp->m_sb, ip->i_ino));
ASSERT(ip->i_ino != mp->m_sb.sb_gquotino);
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
ASSERT((flags & ~(XFS_QMOPT_FORCE_RES | XFS_QMOPT_ENOSPC)) == ASSERT((flags & ~(XFS_QMOPT_FORCE_RES | XFS_QMOPT_ENOSPC)) ==