svn commit: r358257 - in head/sys: kern sys

[Ryan Libby]

Author: rlibby
Date: Sun Feb 23 03:32:11 2020
New Revision: 358257
URL: https://svnweb.freebsd.org/changeset/base/358257

Log:
  vfs: quiet -Wwrite-strings
  
  Reviewed by:	kib, markj
  Differential Revision:	https://reviews.freebsd.org/D23797

Modified:
  head/sys/kern/vfs_subr.c
  head/sys/kern/vfs_vnops.c
  head/sys/kern/vnode_if.src
  head/sys/sys/vnode.h

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Sun Feb 23 03:32:04 2020	(r358256)
+++ head/sys/kern/vfs_subr.c	Sun Feb 23 03:32:11 2020	(r358257)
@@ -4040,7 +4040,7 @@ vcount(struct vnode *vp)
 /*
  * Print out a description of a vnode.
  */
-static char *typename[] =
+static const char * const typename[] =
 {"VNON", "VREG", "VDIR", "VBLK", "VCHR", "VLNK", "VSOCK", "VFIFO", "VBAD",
  "VMARKER"};
 

Modified: head/sys/kern/vfs_vnops.c
==============================================================================
--- head/sys/kern/vfs_vnops.c	Sun Feb 23 03:32:04 2020	(r358256)
+++ head/sys/kern/vfs_vnops.c	Sun Feb 23 03:32:11 2020	(r358257)
@@ -1566,7 +1566,8 @@ vn_poll(struct file *fp, int events, struct ucred *act
  * permits vn_lock to return doomed vnodes.
  */
 static int __noinline
-_vn_lock_fallback(struct vnode *vp, int flags, char *file, int line, int error)
+_vn_lock_fallback(struct vnode *vp, int flags, const char *file, int line,
+    int error)
 {
 
 	KASSERT((flags & LK_RETRY) == 0 || error == 0,
@@ -1602,7 +1603,7 @@ _vn_lock_fallback(struct vnode *vp, int flags, char *f
 }
 
 int
-_vn_lock(struct vnode *vp, int flags, char *file, int line)
+_vn_lock(struct vnode *vp, int flags, const char *file, int line)
 {
 	int error;
 

Modified: head/sys/kern/vnode_if.src
==============================================================================
--- head/sys/kern/vnode_if.src	Sun Feb 23 03:32:04 2020	(r358256)
+++ head/sys/kern/vnode_if.src	Sun Feb 23 03:32:11 2020	(r358257)
@@ -380,7 +380,7 @@ vop_reclaim {
 vop_lock1 {
 	IN struct vnode *vp;
 	IN int flags;
-	IN char *file;
+	IN const char *file;
 	IN int line;
 };
 

Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h	Sun Feb 23 03:32:04 2020	(r358256)
+++ head/sys/sys/vnode.h	Sun Feb 23 03:32:11 2020	(r358257)
@@ -689,7 +689,7 @@ int	vn_generic_copy_file_range(struct vnode *invp, off
 	    struct thread *fsize_td);
 int	vn_need_pageq_flush(struct vnode *vp);
 int	vn_isdisk(struct vnode *vp, int *errp);
-int	_vn_lock(struct vnode *vp, int flags, char *file, int line);
+int	_vn_lock(struct vnode *vp, int flags, const char *file, int line);
 #define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__)
 int	vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp);
 int	vn_open_cred(struct nameidata *ndp, int *flagp, int cmode,