BSD 4_3_Tahoe release

[unix-history] / usr / src / sys / sys / quota_sys.c

diff --git a/usr/src/sys/sys/quota_sys.c b/usr/src/sys/sys/quota_sys.c
index a9a3020..fb84a17 100644 (file)
--- a/usr/src/sys/sys/quota_sys.c
+++ b/usr/src/sys/sys/quota_sys.c
@@ -1,9 +1,20 @@
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)quota_sys.c 7.1 (Berkeley) 6/5/86
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)quota_sys.c 7.4 (Berkeley) 6/29/88

  */
 
 /*
  */
 
 /*


@@ -42,7 +53,7 @@ setquota()
        if (u.u_error)
                return;
        for (mp = mount; mp < &mount[NMOUNT]; mp++)
        if (u.u_error)
                return;
        for (mp = mount; mp < &mount[NMOUNT]; mp++)

-               if (mp->m_bufp && mp->m_dev == dev) {
+               if (mp->m_fs && mp->m_dev == dev) {

                        if (uap->fname == NULL)
                                closedq(mp);
                        else
                        if (uap->fname == NULL)
                                closedq(mp);
                        else


@@ -325,7 +336,7 @@ qsync(dev)
        if (!suser())
                return (u.u_error);                     /* XXX */
        for (mp = mount, index = 0; mp < &mount[NMOUNT]; mp++, index++)
        if (!suser())
                return (u.u_error);                     /* XXX */
        for (mp = mount, index = 0; mp < &mount[NMOUNT]; mp++, index++)

-               if (mp->m_bufp && mp->m_qinod &&
+               if (mp->m_fs && mp->m_qinod &&

                    (dev == NODEV || dev == mp->m_dev)) {
                        for (q = quota; q < quotaNQUOTA; q++)
                                if (q->q_cnt) {
                    (dev == NODEV || dev == mp->m_dev)) {
                        for (q = quota; q < quotaNQUOTA; q++)
                                if (q->q_cnt) {