diff options
author | wollman <wollman@FreeBSD.org> | 1996-01-05 18:31:58 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 1996-01-05 18:31:58 +0000 |
commit | 26b6c4cd7331e712efed0a1b51a7c62d7d6754e0 (patch) | |
tree | 869e7901fd8fd96a54690e2e658f53bf48c25fe3 /sys | |
parent | 1693c596cf67635d3388213259e416f38be4cd0e (diff) | |
download | FreeBSD-src-26b6c4cd7331e712efed0a1b51a7c62d7d6754e0.zip FreeBSD-src-26b6c4cd7331e712efed0a1b51a7c62d7d6754e0.tar.gz |
Convert QUOTA to new-style option.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/options | 1 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfs_vfsops.c | 17 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_alloc.c | 2 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_inode.c | 2 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_alloc.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_inode.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vfsops.c | 2 | ||||
-rw-r--r-- | sys/msdosfs/msdosfs_vfsops.c | 17 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 4 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 4 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/ufs/lfs/lfs_alloc.c | 4 | ||||
-rw-r--r-- | sys/ufs/lfs/lfs_inode.c | 4 | ||||
-rw-r--r-- | sys/ufs/lfs/lfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_inode.c | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_quota.c | 5 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 4 |
19 files changed, 46 insertions, 42 deletions
diff --git a/sys/conf/options b/sys/conf/options index 67b16b7..e571cd8 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -5,6 +5,7 @@ KTRACE NULLFS opt_staticfs.h PORTAL opt_staticfs.h PROCFS opt_staticfs.h +QUOTA SYSVSHM opt_sysvipc.h SYSVSEM opt_sysvipc.h SYSVMSG opt_sysvipc.h diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 6c1ed69..d3c5281 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.9 1995/11/07 14:10:19 phk Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.10 1995/11/16 11:48:08 bde Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- @@ -469,15 +469,6 @@ mountmsdosfs(devvp, mp, p) mp->mnt_stat.f_fsid.val[0] = (long)dev; mp->mnt_stat.f_fsid.val[1] = MOUNT_MSDOS; mp->mnt_flag |= MNT_LOCAL; -#ifdef QUOTA - /* - * If we ever do quotas for DOS filesystems this would be a place - * to fill in the info in the msdosfsmount structure. You dolt, - * quotas on dos filesystems make no sense because files have no - * owners on dos filesystems. of course there is some empty space - * in the directory entry where we could put uid's and gid's. - */ -#endif devvp->v_specflags |= SI_MOUNTEDON; return 0; @@ -529,8 +520,6 @@ msdosfs_unmount(mp, mntflags, p) return EINVAL; flags |= FORCECLOSE; } -#ifdef QUOTA -#endif error = vflush(mp, NULLVP, flags); if (error) return error; @@ -572,11 +561,7 @@ msdosfs_quotactl(mp, cmds, uid, arg, p) caddr_t arg; struct proc *p; { -#ifdef QUOTA - return EOPNOTSUPP; -#else return EOPNOTSUPP; -#endif } static int diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c index e954150..eeff9f6 100644 --- a/sys/gnu/ext2fs/ext2_alloc.c +++ b/sys/gnu/ext2fs/ext2_alloc.c @@ -42,6 +42,8 @@ #if !defined(__FreeBSD__) #include "quota.h" #include "diagnostic.h" +#else +#include "opt_quota.h" #endif #include <sys/param.h> diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c index 7ae39a6..2b40d37 100644 --- a/sys/gnu/ext2fs/ext2_inode.c +++ b/sys/gnu/ext2fs/ext2_inode.c @@ -42,6 +42,8 @@ #if !defined(__FreeBSD__) #include "quota.h" #include "diagnostic.h" +#else +#include "opt_quota.h" #endif #include <sys/param.h> diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index 1054e49..d517e95 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -41,6 +41,8 @@ #if !defined(__FreeBSD__) #include "quota.h" +#else +#include "opt_quota.h" #endif #include <sys/param.h> diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c index e954150..eeff9f6 100644 --- a/sys/gnu/fs/ext2fs/ext2_alloc.c +++ b/sys/gnu/fs/ext2fs/ext2_alloc.c @@ -42,6 +42,8 @@ #if !defined(__FreeBSD__) #include "quota.h" #include "diagnostic.h" +#else +#include "opt_quota.h" #endif #include <sys/param.h> diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c index 7ae39a6..2b40d37 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -42,6 +42,8 @@ #if !defined(__FreeBSD__) #include "quota.h" #include "diagnostic.h" +#else +#include "opt_quota.h" #endif #include <sys/param.h> diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 1054e49..d517e95 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -41,6 +41,8 @@ #if !defined(__FreeBSD__) #include "quota.h" +#else +#include "opt_quota.h" #endif #include <sys/param.h> diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index 6c1ed69..d3c5281 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.9 1995/11/07 14:10:19 phk Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.10 1995/11/16 11:48:08 bde Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- @@ -469,15 +469,6 @@ mountmsdosfs(devvp, mp, p) mp->mnt_stat.f_fsid.val[0] = (long)dev; mp->mnt_stat.f_fsid.val[1] = MOUNT_MSDOS; mp->mnt_flag |= MNT_LOCAL; -#ifdef QUOTA - /* - * If we ever do quotas for DOS filesystems this would be a place - * to fill in the info in the msdosfsmount structure. You dolt, - * quotas on dos filesystems make no sense because files have no - * owners on dos filesystems. of course there is some empty space - * in the directory entry where we could put uid's and gid's. - */ -#endif devvp->v_specflags |= SI_MOUNTEDON; return 0; @@ -529,8 +520,6 @@ msdosfs_unmount(mp, mntflags, p) return EINVAL; flags |= FORCECLOSE; } -#ifdef QUOTA -#endif error = vflush(mp, NULLVP, flags); if (error) return error; @@ -572,11 +561,7 @@ msdosfs_quotactl(mp, cmds, uid, arg, p) caddr_t arg; struct proc *p; { -#ifdef QUOTA - return EOPNOTSUPP; -#else return EOPNOTSUPP; -#endif } static int diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index b000d56..fa7e71d 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $Id: ffs_alloc.c,v 1.21 1995/12/15 03:36:25 peter Exp $ + * $Id: ffs_alloc.c,v 1.22 1995/12/17 21:09:29 phk Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 6e53833..8c99d2b 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: ffs_inode.c,v 1.17 1995/12/07 12:47:50 davidg Exp $ + * $Id: ffs_inode.c,v 1.18 1995/12/11 04:57:37 dyson Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/mount.h> diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 288e69c..203a535 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $Id: ffs_vfsops.c,v 1.31 1995/12/11 04:57:39 dyson Exp $ + * $Id: ffs_vfsops.c,v 1.32 1995/12/17 21:09:35 phk Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c index a64c34a..8d4e044 100644 --- a/sys/ufs/lfs/lfs_alloc.c +++ b/sys/ufs/lfs/lfs_alloc.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)lfs_alloc.c 8.4 (Berkeley) 1/4/94 - * $Id: lfs_alloc.c,v 1.8 1995/04/16 11:25:47 davidg Exp $ + * $Id: lfs_alloc.c,v 1.9 1995/12/07 12:47:55 davidg Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c index a7dfcb5..3e5e764 100644 --- a/sys/ufs/lfs/lfs_inode.c +++ b/sys/ufs/lfs/lfs_inode.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)lfs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_inode.c,v 1.10 1995/09/04 00:21:00 dyson Exp $ + * $Id: lfs_inode.c,v 1.11 1995/12/07 12:47:55 davidg Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/mount.h> diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c index 58de7b7..c85f3c0 100644 --- a/sys/ufs/lfs/lfs_vfsops.c +++ b/sys/ufs/lfs/lfs_vfsops.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. * * @(#)lfs_vfsops.c 8.7 (Berkeley) 4/16/94 - * $Id: lfs_vfsops.c,v 1.12 1995/08/28 09:19:12 julian Exp $ + * $Id: lfs_vfsops.c,v 1.13 1995/12/17 21:09:53 phk Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index 54c6247..bbf0e7f 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)ufs_inode.c 8.4 (Berkeley) 1/21/94 - * $Id: ufs_inode.c,v 1.6 1995/01/04 23:48:04 gibbs Exp $ + * $Id: ufs_inode.c,v 1.7 1995/11/05 23:35:57 dyson Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 4b578ea..5bfd829 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -34,8 +34,11 @@ * SUCH DAMAGE. * * @(#)ufs_quota.c 8.2 (Berkeley) 12/30/93 - * $Id: ufs_quota.c,v 1.5 1995/05/30 08:15:36 rgrimes Exp $ + * $Id: ufs_quota.c,v 1.6 1995/12/22 15:58:56 phk Exp $ */ + +#include "opt_quota.h" /* not really necessary... */ + #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c index 950f386..41f50d4 100644 --- a/sys/ufs/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs/ufs_vfsops.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)ufs_vfsops.c 8.4 (Berkeley) 4/16/94 - * $Id: ufs_vfsops.c,v 1.3 1994/10/08 06:57:28 phk Exp $ + * $Id: ufs_vfsops.c,v 1.4 1995/03/10 22:06:39 davidg Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/mbuf.h> #include <sys/mount.h> diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index dd61ba4..4ac9bbb 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.10 (Berkeley) 4/1/94 - * $Id: ufs_vnops.c,v 1.34 1995/11/19 19:46:23 dyson Exp $ + * $Id: ufs_vnops.c,v 1.35 1995/12/11 04:57:49 dyson Exp $ */ +#include "opt_quota.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> |