diff options
| author | phk <phk@FreeBSD.org> | 1999-04-27 11:18:52 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-04-27 11:18:52 +0000 |
| commit | 16e3fbd2c114d665755299002f1c50dd11ba7245 (patch) | |
| tree | d7f6bebfe177ae90b67d27603da4d211433088e5 /sys/dev/cy | |
| parent | aba5e776bb95610ea3e3355cbf47aadb844773eb (diff) | |
| download | FreeBSD-src-16e3fbd2c114d665755299002f1c50dd11ba7245.zip FreeBSD-src-16e3fbd2c114d665755299002f1c50dd11ba7245.tar.gz | |
Suser() simplification:
1:
s/suser/suser_xxx/
2:
Add new function: suser(struct proc *), prototyped in <sys/proc.h>.
3:
s/suser_xxx(\([a-zA-Z0-9_]*\)->p_ucred, \&\1->p_acflag)/suser(\1)/
The remaining suser_xxx() calls will be scrutinized and dealt with
later.
There may be some unneeded #include <sys/cred.h>, but they are left
as an exercise for Bruce.
More changes to the suser() API will come along with the "jail" code.
Diffstat (limited to 'sys/dev/cy')
| -rw-r--r-- | sys/dev/cy/cy.c | 8 | ||||
| -rw-r--r-- | sys/dev/cy/cy_isa.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index e513c05..6947d09 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.85 1999/01/30 12:17:33 phk Exp $ + * $Id: cy.c,v 1.86 1999/02/04 15:54:02 bde Exp $ */ #include "opt_compat.h" @@ -718,7 +718,7 @@ open_top: } } if (tp->t_state & TS_XCLUDE && - suser(p->p_ucred, &p->p_acflag)) { + suser(p)) { error = EBUSY; goto out; } @@ -1623,7 +1623,7 @@ sioioctl(dev, cmd, data, flag, p) } switch (cmd) { case TIOCSETA: - error = suser(p->p_ucred, &p->p_acflag); + error = suser(p); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1722,7 +1722,7 @@ sioioctl(dev, cmd, data, flag, p) break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(p->p_ucred, &p->p_acflag); + error = suser(p); if (error != 0) { splx(s); return (error); diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index e513c05..6947d09 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.85 1999/01/30 12:17:33 phk Exp $ + * $Id: cy.c,v 1.86 1999/02/04 15:54:02 bde Exp $ */ #include "opt_compat.h" @@ -718,7 +718,7 @@ open_top: } } if (tp->t_state & TS_XCLUDE && - suser(p->p_ucred, &p->p_acflag)) { + suser(p)) { error = EBUSY; goto out; } @@ -1623,7 +1623,7 @@ sioioctl(dev, cmd, data, flag, p) } switch (cmd) { case TIOCSETA: - error = suser(p->p_ucred, &p->p_acflag); + error = suser(p); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1722,7 +1722,7 @@ sioioctl(dev, cmd, data, flag, p) break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(p->p_ucred, &p->p_acflag); + error = suser(p); if (error != 0) { splx(s); return (error); |
