VFS quota: replace MNT_ACCOUNTING by MNT_QUOTA

Getting back a bit of MNT_xxx flag space

diff --git a/sbin/vquota/vquota.c b/sbin/vquota/vquota.c
index ec4d394..d86bf34 100644 (file)
--- a/sbin/vquota/vquota.c
+++ b/sbin/vquota/vquota.c
@@ -416,8 +416,8 @@ get_fslist(void)
 
        /* iterate mounted filesystems */
        for (i=0; i<nloc; i++) {
-           /* vfs accounting enabled on this one ? */
-           if (mntbufp[i].f_flags & MNT_ACCOUNTING)
+           /* vfs quota enabled on this one ? */
+           if (mntbufp[i].f_flags & MNT_QUOTA)
                printf("%s on %s\n", mntbufp[i].f_mntfromname,
                    mntbufp[i].f_mntonname);
        }

diff --git a/sys/kern/vfs_quota.c b/sys/kern/vfs_quota.c
index 9bf554b..1467944 100644 (file)
--- a/sys/kern/vfs_quota.c
+++ b/sys/kern/vfs_quota.c
@@ -131,8 +131,8 @@ vq_init(struct mount *mp)
 
        /* enable data collection */
        mp->mnt_op->vfs_account = vfs_stdaccount;
-       /* mark this filesystem as having accounting enabled */
-       mp->mnt_flag |= MNT_ACCOUNTING;
+       /* mark this filesystem quota enabled */
+       mp->mnt_flag |= MNT_QUOTA;
        if (bootverbose)
                kprintf("vfs accounting enabled for %s\n",
                    mp->mnt_stat.f_mntonname);

diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 096e050..27e28cf 100644 (file)
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -293,7 +293,6 @@ struct mount {
 #define        MNT_QUOTA       0x00002000      /* quotas are enabled on filesystem */
 #define        MNT_ROOTFS      0x00004000      /* identifies the root filesystem */
 #define        MNT_USER        0x00008000      /* mounted by a user */
-#define        MNT_ACCOUNTING  0x00020000      /* accounting is enabled on filesystem */
 #define        MNT_IGNORE      0x00800000      /* do not show entry in df */
 
 /*
@@ -309,7 +308,7 @@ struct mount {
                        MNT_ROOTFS      | MNT_NOATIME   | MNT_NOCLUSTERR| \
                        MNT_NOCLUSTERW  | MNT_SUIDDIR   | MNT_SOFTDEP   | \
                        MNT_IGNORE      | MNT_NOSYMFOLLOW | MNT_EXPUBLIC| \
-                       MNT_ACCOUNTING  | MNT_TRIM)
+                       MNT_TRIM)
 /*
  * External filesystem command modifier flags.
  * Unmount can use the MNT_FORCE flag.