Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/ufs/ext2fs Small cosmetic change.



details:   https://anonhg.NetBSD.org/src/rev/0caaf3675173
branches:  trunk
changeset: 483968:0caaf3675173
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Mar 22 01:03:33 2000 +0000

description:
Small cosmetic change.

diffstat:

 sys/ufs/ext2fs/ext2fs_vnops.c |  25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diffs (51 lines):

diff -r 063f9b5dac67 -r 0caaf3675173 sys/ufs/ext2fs/ext2fs_vnops.c
--- a/sys/ufs/ext2fs/ext2fs_vnops.c     Wed Mar 22 00:58:16 2000 +0000
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c     Wed Mar 22 01:03:33 2000 +0000
@@ -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 @@
         * 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 @@
                        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))



Home | Main Index | Thread Index | Old Index