xfs: mark xfs_qm_quotacheck as static
xfs_qm_quotacheck() is not used outside of xfs_qm.c. Mark it static and move it around in the file to avoid a forward declaration. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jie Liu <jeff.liu@oracle.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Jie Liu
Dave Chinner
parent
5c18717ea2
commit
eb866bbf09
2 changed files with 94 additions and 96 deletions
189
fs/xfs/xfs_qm.c
189
fs/xfs/xfs_qm.c
|
|
@ -221,100 +221,6 @@ xfs_qm_unmount(
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This is called from xfs_mountfs to start quotas and initialize all
|
||||
* necessary data structures like quotainfo. This is also responsible for
|
||||
* running a quotacheck as necessary. We are guaranteed that the superblock
|
||||
* is consistently read in at this point.
|
||||
*
|
||||
* If we fail here, the mount will continue with quota turned off. We don't
|
||||
* need to inidicate success or failure at all.
|
||||
*/
|
||||
void
|
||||
xfs_qm_mount_quotas(
|
||||
xfs_mount_t *mp)
|
||||
{
|
||||
int error = 0;
|
||||
uint sbf;
|
||||
|
||||
/*
|
||||
* If quotas on realtime volumes is not supported, we disable
|
||||
* quotas immediately.
|
||||
*/
|
||||
if (mp->m_sb.sb_rextents) {
|
||||
xfs_notice(mp, "Cannot turn on quotas for realtime filesystem");
|
||||
mp->m_qflags = 0;
|
||||
goto write_changes;
|
||||
}
|
||||
|
||||
ASSERT(XFS_IS_QUOTA_RUNNING(mp));
|
||||
|
||||
/*
|
||||
* Allocate the quotainfo structure inside the mount struct, and
|
||||
* create quotainode(s), and change/rev superblock if necessary.
|
||||
*/
|
||||
error = xfs_qm_init_quotainfo(mp);
|
||||
if (error) {
|
||||
/*
|
||||
* We must turn off quotas.
|
||||
*/
|
||||
ASSERT(mp->m_quotainfo == NULL);
|
||||
mp->m_qflags = 0;
|
||||
goto write_changes;
|
||||
}
|
||||
/*
|
||||
* If any of the quotas are not consistent, do a quotacheck.
|
||||
*/
|
||||
if (XFS_QM_NEED_QUOTACHECK(mp)) {
|
||||
error = xfs_qm_quotacheck(mp);
|
||||
if (error) {
|
||||
/* Quotacheck failed and disabled quotas. */
|
||||
return;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* If one type of quotas is off, then it will lose its
|
||||
* quotachecked status, since we won't be doing accounting for
|
||||
* that type anymore.
|
||||
*/
|
||||
if (!XFS_IS_UQUOTA_ON(mp))
|
||||
mp->m_qflags &= ~XFS_UQUOTA_CHKD;
|
||||
if (!XFS_IS_GQUOTA_ON(mp))
|
||||
mp->m_qflags &= ~XFS_GQUOTA_CHKD;
|
||||
if (!XFS_IS_PQUOTA_ON(mp))
|
||||
mp->m_qflags &= ~XFS_PQUOTA_CHKD;
|
||||
|
||||
write_changes:
|
||||
/*
|
||||
* We actually don't have to acquire the m_sb_lock at all.
|
||||
* This can only be called from mount, and that's single threaded. XXX
|
||||
*/
|
||||
spin_lock(&mp->m_sb_lock);
|
||||
sbf = mp->m_sb.sb_qflags;
|
||||
mp->m_sb.sb_qflags = mp->m_qflags & XFS_MOUNT_QUOTA_ALL;
|
||||
spin_unlock(&mp->m_sb_lock);
|
||||
|
||||
if (sbf != (mp->m_qflags & XFS_MOUNT_QUOTA_ALL)) {
|
||||
if (xfs_qm_write_sb_changes(mp, XFS_SB_QFLAGS)) {
|
||||
/*
|
||||
* We could only have been turning quotas off.
|
||||
* We aren't in very good shape actually because
|
||||
* the incore structures are convinced that quotas are
|
||||
* off, but the on disk superblock doesn't know that !
|
||||
*/
|
||||
ASSERT(!(XFS_IS_QUOTA_RUNNING(mp)));
|
||||
xfs_alert(mp, "%s: Superblock update failed!",
|
||||
__func__);
|
||||
}
|
||||
}
|
||||
|
||||
if (error) {
|
||||
xfs_warn(mp, "Failed to initialize disk quotas.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Called from the vfsops layer.
|
||||
*/
|
||||
|
|
@ -1330,7 +1236,7 @@ out_unlock:
|
|||
* Walk thru all the filesystem inodes and construct a consistent view
|
||||
* of the disk quota world. If the quotacheck fails, disable quotas.
|
||||
*/
|
||||
int
|
||||
STATIC int
|
||||
xfs_qm_quotacheck(
|
||||
xfs_mount_t *mp)
|
||||
{
|
||||
|
|
@ -1466,6 +1372,99 @@ xfs_qm_quotacheck(
|
|||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* This is called from xfs_mountfs to start quotas and initialize all
|
||||
* necessary data structures like quotainfo. This is also responsible for
|
||||
* running a quotacheck as necessary. We are guaranteed that the superblock
|
||||
* is consistently read in at this point.
|
||||
*
|
||||
* If we fail here, the mount will continue with quota turned off. We don't
|
||||
* need to inidicate success or failure at all.
|
||||
*/
|
||||
void
|
||||
xfs_qm_mount_quotas(
|
||||
struct xfs_mount *mp)
|
||||
{
|
||||
int error = 0;
|
||||
uint sbf;
|
||||
|
||||
/*
|
||||
* If quotas on realtime volumes is not supported, we disable
|
||||
* quotas immediately.
|
||||
*/
|
||||
if (mp->m_sb.sb_rextents) {
|
||||
xfs_notice(mp, "Cannot turn on quotas for realtime filesystem");
|
||||
mp->m_qflags = 0;
|
||||
goto write_changes;
|
||||
}
|
||||
|
||||
ASSERT(XFS_IS_QUOTA_RUNNING(mp));
|
||||
|
||||
/*
|
||||
* Allocate the quotainfo structure inside the mount struct, and
|
||||
* create quotainode(s), and change/rev superblock if necessary.
|
||||
*/
|
||||
error = xfs_qm_init_quotainfo(mp);
|
||||
if (error) {
|
||||
/*
|
||||
* We must turn off quotas.
|
||||
*/
|
||||
ASSERT(mp->m_quotainfo == NULL);
|
||||
mp->m_qflags = 0;
|
||||
goto write_changes;
|
||||
}
|
||||
/*
|
||||
* If any of the quotas are not consistent, do a quotacheck.
|
||||
*/
|
||||
if (XFS_QM_NEED_QUOTACHECK(mp)) {
|
||||
error = xfs_qm_quotacheck(mp);
|
||||
if (error) {
|
||||
/* Quotacheck failed and disabled quotas. */
|
||||
return;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* If one type of quotas is off, then it will lose its
|
||||
* quotachecked status, since we won't be doing accounting for
|
||||
* that type anymore.
|
||||
*/
|
||||
if (!XFS_IS_UQUOTA_ON(mp))
|
||||
mp->m_qflags &= ~XFS_UQUOTA_CHKD;
|
||||
if (!XFS_IS_GQUOTA_ON(mp))
|
||||
mp->m_qflags &= ~XFS_GQUOTA_CHKD;
|
||||
if (!XFS_IS_PQUOTA_ON(mp))
|
||||
mp->m_qflags &= ~XFS_PQUOTA_CHKD;
|
||||
|
||||
write_changes:
|
||||
/*
|
||||
* We actually don't have to acquire the m_sb_lock at all.
|
||||
* This can only be called from mount, and that's single threaded. XXX
|
||||
*/
|
||||
spin_lock(&mp->m_sb_lock);
|
||||
sbf = mp->m_sb.sb_qflags;
|
||||
mp->m_sb.sb_qflags = mp->m_qflags & XFS_MOUNT_QUOTA_ALL;
|
||||
spin_unlock(&mp->m_sb_lock);
|
||||
|
||||
if (sbf != (mp->m_qflags & XFS_MOUNT_QUOTA_ALL)) {
|
||||
if (xfs_qm_write_sb_changes(mp, XFS_SB_QFLAGS)) {
|
||||
/*
|
||||
* We could only have been turning quotas off.
|
||||
* We aren't in very good shape actually because
|
||||
* the incore structures are convinced that quotas are
|
||||
* off, but the on disk superblock doesn't know that !
|
||||
*/
|
||||
ASSERT(!(XFS_IS_QUOTA_RUNNING(mp)));
|
||||
xfs_alert(mp, "%s: Superblock update failed!",
|
||||
__func__);
|
||||
}
|
||||
}
|
||||
|
||||
if (error) {
|
||||
xfs_warn(mp, "Failed to initialize disk quotas.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* This is called after the superblock has been read in and we're ready to
|
||||
* iget the quota inodes.
|
||||
|
|
|
|||
|
|
@ -157,7 +157,6 @@ struct xfs_dquot_acct {
|
|||
#define XFS_QM_RTBWARNLIMIT 5
|
||||
|
||||
extern void xfs_qm_destroy_quotainfo(struct xfs_mount *);
|
||||
extern int xfs_qm_quotacheck(struct xfs_mount *);
|
||||
extern int xfs_qm_write_sb_changes(struct xfs_mount *, __int64_t);
|
||||
|
||||
/* dquot stuff */
|
||||
|
|
|
|||
Loading…
Reference in a new issue