diff options
| author | rwatson <rwatson@FreeBSD.org> | 2005-01-23 21:11:39 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2005-01-23 21:11:39 +0000 |
| commit | 8a8bdb081089ca2d939a031c1b0d502f25c8d2e8 (patch) | |
| tree | 63dd37701c79a17118eaba4776b26aeff2951c38 /sys/kern/kern_prot.c | |
| parent | 1d8015ceb7d7567b75c83f37f7f00510ee6eeca6 (diff) | |
| download | FreeBSD-src-8a8bdb081089ca2d939a031c1b0d502f25c8d2e8.zip FreeBSD-src-8a8bdb081089ca2d939a031c1b0d502f25c8d2e8.tar.gz | |
Style cleanup: with removal of mutex operations, we can also remove
{}'s from securelevel_gt() and securelevel_ge().
MFC after: 1 week
Diffstat (limited to 'sys/kern/kern_prot.c')
| -rw-r--r-- | sys/kern/kern_prot.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 57216db..38b9042 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1275,10 +1275,9 @@ securelevel_gt(struct ucred *cr, int level) active_securelevel = securelevel; KASSERT(cr != NULL, ("securelevel_gt: null cr")); - if (cr->cr_prison != NULL) { + if (cr->cr_prison != NULL) active_securelevel = imax(cr->cr_prison->pr_securelevel, active_securelevel); - } return (active_securelevel > level ? EPERM : 0); } @@ -1289,10 +1288,9 @@ securelevel_ge(struct ucred *cr, int level) active_securelevel = securelevel; KASSERT(cr != NULL, ("securelevel_ge: null cr")); - if (cr->cr_prison != NULL) { + if (cr->cr_prison != NULL) active_securelevel = imax(cr->cr_prison->pr_securelevel, active_securelevel); - } return (active_securelevel >= level ? EPERM : 0); } |
