[src/trunk]: src/sys/ufs/ufs Remove gcc hack, it does not help.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48bb761beca9
branches:  trunk
changeset: 344713:48bb761beca9
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Apr 12 16:12:22 2016 +0000

description:
Remove gcc hack, it does not help.
Add more const.

diffstat:

 sys/ufs/ufs/ufs_extern.h |  4 ++--
 sys/ufs/ufs/ufs_lookup.c |  8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 08adeb4d394e -r 48bb761beca9 sys/ufs/ufs/ufs_extern.h
--- a/sys/ufs/ufs/ufs_extern.h  Tue Apr 12 15:56:05 2016 +0000
+++ b/sys/ufs/ufs/ufs_extern.h  Tue Apr 12 16:12:22 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_extern.h,v 1.81 2016/04/12 00:36:29 christos Exp $ */
+/*     $NetBSD: ufs_extern.h,v 1.82 2016/04/12 16:12:22 christos Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -115,7 +115,7 @@
 
 /* ufs_lookup.c */
 void   ufs_dirbad(struct inode *, doff_t, const char *);
-const char *ufs_dirbadentry(struct vnode *, struct direct *, int);
+const char *ufs_dirbadentry(const struct vnode *, const struct direct *, int);
 void   ufs_makedirentry(struct inode *, struct componentname *,
                         struct direct *);
 int    ufs_direnter(struct vnode *, const struct ufs_lookup_results *,
diff -r 08adeb4d394e -r 48bb761beca9 sys/ufs/ufs/ufs_lookup.c
--- a/sys/ufs/ufs/ufs_lookup.c  Tue Apr 12 15:56:05 2016 +0000
+++ b/sys/ufs/ufs/ufs_lookup.c  Tue Apr 12 16:12:22 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_lookup.c,v 1.139 2016/04/12 15:56:05 christos Exp $        */
+/*     $NetBSD: ufs_lookup.c,v 1.140 2016/04/12 16:12:22 christos Exp $        */
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.139 2016/04/12 15:56:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.140 2016/04/12 16:12:22 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ffs.h"
@@ -384,14 +384,12 @@
                results->ulr_offset = 0;
                numdirpasses = 1;
        } else {
-               struct buf *vbp = bp;   // XXX: gcc
                results->ulr_offset = results->ulr_diroff;
                entryoffsetinblock = results->ulr_offset & bmask;
                if (entryoffsetinblock != 0 &&
                    (error = ufs_blkatoff(vdp, (off_t)results->ulr_offset,
-                   NULL, &vbp, false)))
+                   NULL, &bp, false)))
                        goto out;
-               bp = vbp;
                numdirpasses = 2;
                namecache_count_2passes();
        }