CVS commit: src/sys/ufs/ufs

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Tue Apr 12 16:12:22 UTC 2016

Modified Files:
        src/sys/ufs/ufs: ufs_extern.h ufs_lookup.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/ufs/ufs/ufs_extern.h
cvs rdiff -u -r1.139 -r1.140 src/sys/ufs/ufs/ufs_lookup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/ufs/ufs/ufs_extern.h
diff -u src/sys/ufs/ufs/ufs_extern.h:1.81 src/sys/ufs/ufs/ufs_extern.h:1.82
--- src/sys/ufs/ufs/ufs_extern.h:1.81	Mon Apr 11 20:36:29 2016
+++ src/sys/ufs/ufs/ufs_extern.h	Tue Apr 12 12:12:22 2016
@@ -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 @@ int	ufs_truncate(struct vnode *, uint64_
 
 /* 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 *,

Index: src/sys/ufs/ufs/ufs_lookup.c
diff -u src/sys/ufs/ufs/ufs_lookup.c:1.139 src/sys/ufs/ufs/ufs_lookup.c:1.140
--- src/sys/ufs/ufs/ufs_lookup.c:1.139	Tue Apr 12 11:56:05 2016
+++ src/sys/ufs/ufs/ufs_lookup.c	Tue Apr 12 12:12:22 2016
@@ -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 @@ ufs_lookup(void *v)
 		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();
 	}