diff options
| author | thorpej <thorpej@NetBSD.org> | 2000-03-22 01:03:33 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2000-03-22 01:03:33 +0000 |
| commit | fa7d868adedce2eebeac564e1969cc3d720f9971 (patch) | |
| tree | beb4f7ef260a5f944cbc21ab8df128dbd87503c0 /sys | |
| parent | 7c35662066f31f9ea6d581b72fcc249eaea00391 (diff) | |
Small cosmetic change.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vnops.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index 50e723a0e29..999be28e71b 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_vnops.c,v 1.23 2000/01/28 16:00:23 bouyer Exp $ */ +/* $NetBSD: ext2fs_vnops.c,v 1.24 2000/03/22 01:03:33 thorpej Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. @@ -307,9 +307,9 @@ ext2fs_setattr(v) * Check for unsettable attributes. */ if ((vap->va_type != VNON) || (vap->va_nlink != (nlink_t)VNOVAL) || - (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) || - (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) || - ((int)vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) { + (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) || + (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) || + ((int)vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) { return (EINVAL); } if (vap->va_flags != VNOVAL) { @@ -320,19 +320,20 @@ ext2fs_setattr(v) return (error); #ifdef EXT2FS_SYSTEM_FLAGS if (cred->cr_uid == 0) { - if ((ip->i_e2fs_flags & (EXT2_APPEND | EXT2_IMMUTABLE)) && - securelevel > 0) + if ((ip->i_e2fs_flags & + (EXT2_APPEND | EXT2_IMMUTABLE)) && securelevel > 0) return (EPERM); ip->i_e2fs_flags &= ~(EXT2_APPEND | EXT2_IMMUTABLE); - ip->i_e2fs_flags |= (vap->va_flags & SF_APPEND) ? EXT2_APPEND : 0 | - (vap->va_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE: 0; - } else { + ip->i_e2fs_flags |= + (vap->va_flags & SF_APPEND) ? EXT2_APPEND : 0 | + (vap->va_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE : 0; + } else return (EPERM); - } #else ip->i_e2fs_flags &= ~(EXT2_APPEND | EXT2_IMMUTABLE); - ip->i_e2fs_flags |= (vap->va_flags & UF_APPEND) ? EXT2_APPEND : 0 | - (vap->va_flags & UF_IMMUTABLE) ? EXT2_IMMUTABLE: 0; + ip->i_e2fs_flags |= + (vap->va_flags & UF_APPEND) ? EXT2_APPEND : 0 | + (vap->va_flags & UF_IMMUTABLE) ? EXT2_IMMUTABLE : 0; #endif ip->i_flag |= IN_CHANGE; if (vap->va_flags & (IMMUTABLE | APPEND)) |
