Source-Changes-HG archive

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

[src/trunk]: src/sys/ufs/ext2fs Whitespace nits.



details:   https://anonhg.NetBSD.org/src/rev/396869ce1c92
branches:  trunk
changeset: 747364:396869ce1c92
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Sep 12 11:35:46 2009 +0000

description:
Whitespace nits.

diffstat:

 sys/ufs/ext2fs/ext2fs_alloc.c  |   9 ++++-----
 sys/ufs/ext2fs/ext2fs_lookup.c |   6 +++---
 sys/ufs/ext2fs/ext2fs_vnops.c  |  24 ++++++++++++------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diffs (123 lines):

diff -r 02a9d2ede108 -r 396869ce1c92 sys/ufs/ext2fs/ext2fs_alloc.c
--- a/sys/ufs/ext2fs/ext2fs_alloc.c     Sat Sep 12 11:27:39 2009 +0000
+++ b/sys/ufs/ext2fs/ext2fs_alloc.c     Sat Sep 12 11:35:46 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_alloc.c,v 1.39 2009/05/07 19:26:08 elad Exp $   */
+/*     $NetBSD: ext2fs_alloc.c,v 1.40 2009/09/12 11:35:46 tsutsui Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.39 2009/05/07 19:26:08 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.40 2009/09/12 11:35:46 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,8 +90,7 @@
 static u_long  ext2fs_dirpref(struct m_ext2fs *);
 static void    ext2fs_fserr(struct m_ext2fs *, u_int, const char *);
 static u_long  ext2fs_hashalloc(struct inode *, int, long, int,
-                                  daddr_t (*)(struct inode *, int, daddr_t,
-                                                  int));
+                   daddr_t (*)(struct inode *, int, daddr_t, int));
 static daddr_t ext2fs_nodealloccg(struct inode *, int, daddr_t, int);
 static daddr_t ext2fs_mapsearch(struct m_ext2fs *, char *, daddr_t);
 
@@ -139,7 +138,7 @@
        else
                cg = dtog(fs, bpref);
        bno = (daddr_t)ext2fs_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
-                                                ext2fs_alloccg);
+           ext2fs_alloccg);
        if (bno > 0) {
                ip->i_e2fs_nblock += btodb(fs->e2fs_bsize);
                ip->i_flag |= IN_CHANGE | IN_UPDATE;
diff -r 02a9d2ede108 -r 396869ce1c92 sys/ufs/ext2fs/ext2fs_lookup.c
--- a/sys/ufs/ext2fs/ext2fs_lookup.c    Sat Sep 12 11:27:39 2009 +0000
+++ b/sys/ufs/ext2fs/ext2fs_lookup.c    Sat Sep 12 11:35:46 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_lookup.c,v 1.59 2009/09/12 11:27:39 tsutsui Exp $       */
+/*     $NetBSD: ext2fs_lookup.c,v 1.60 2009/09/12 11:35:46 tsutsui Exp $       */
 
 /*
  * Modified for NetBSD 1.2E
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_lookup.c,v 1.59 2009/09/12 11:27:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_lookup.c,v 1.60 2009/09/12 11:35:46 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -267,7 +267,7 @@
        struct vnode *vdp = ap->a_dvp;  /* vnode for directory being searched */
        struct inode *dp = VTOI(vdp);   /* inode for directory being searched */
        struct buf *bp;                 /* a buffer of directory entries */
-       struct ext2fs_direct *ep;       /* the current directory entry */
+       struct ext2fs_direct *ep;       /* the current directory entry */
        int entryoffsetinblock;         /* offset of ep in bp's buffer */
        enum {NONE, COMPACT, FOUND} slotstatus;
        doff_t slotoffset;              /* offset of area with free space */
diff -r 02a9d2ede108 -r 396869ce1c92 sys/ufs/ext2fs/ext2fs_vnops.c
--- a/sys/ufs/ext2fs/ext2fs_vnops.c     Sat Sep 12 11:27:39 2009 +0000
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c     Sat Sep 12 11:35:46 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_vnops.c,v 1.88 2009/07/03 21:17:42 elad Exp $   */
+/*     $NetBSD: ext2fs_vnops.c,v 1.89 2009/09/12 11:35:46 tsutsui Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.88 2009/07/03 21:17:42 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.89 2009/09/12 11:35:46 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -622,7 +622,7 @@
 
 /*
  * Rename system call.
- *     rename("foo", "bar");
+ *     rename("foo", "bar");
  * is essentially
  *     unlink("bar");
  *     link("foo", "bar");
@@ -739,14 +739,14 @@
                goto abortit;
        }
        if ((ip->i_e2fs_mode & IFMT) == IFDIR) {
-               error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred);
-               if (!error && tvp)
-                       error = VOP_ACCESS(tvp, VWRITE, tcnp->cn_cred);
-               if (error) {
-                       VOP_UNLOCK(fvp, 0);
-                       error = EACCES;
-                       goto abortit;
-               }
+               error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred);
+               if (!error && tvp)
+                       error = VOP_ACCESS(tvp, VWRITE, tcnp->cn_cred);
+               if (error) {
+                       VOP_UNLOCK(fvp, 0);
+                       error = EACCES;
+                       goto abortit;
+               }
                /*
                 * Avoid ".", "..", and aliases of "." for obvious reasons.
                 */
@@ -1653,7 +1653,7 @@
        { &vop_pathconf_desc, fifo_pathconf },          /* pathconf */
        { &vop_advlock_desc, fifo_advlock },            /* advlock */
        { &vop_bwrite_desc, vn_bwrite },                /* bwrite */
-       { &vop_putpages_desc, fifo_putpages },          /* putpages */
+       { &vop_putpages_desc, fifo_putpages },          /* putpages */
        { NULL, NULL }
 };
 const struct vnodeopv_desc ext2fs_fifoop_opv_desc =



Home | Main Index | Thread Index | Old Index