From 6b981736db6f47459a2260f5933caaabbd2ccec4 Mon Sep 17 00:00:00 2001
From: agc <agc@NetBSD.org>
Date: Mon, 11 Jun 2012 21:11:40 +0000
Subject: [PATCH] cosmetic change: fix two casts to be of the appropriate type

---
 sys/fs/sysvbfs/bfs.c           | 6 +++---
 sys/fs/sysvbfs/sysvbfs_vnops.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/fs/sysvbfs/bfs.c b/sys/fs/sysvbfs/bfs.c
index 0f7d521e815e..65fda31d32a3 100644
--- a/sys/fs/sysvbfs/bfs.c
+++ b/sys/fs/sysvbfs/bfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bfs.c,v 1.15 2012/05/08 14:28:55 tsutsui Exp $	*/
+/*	$NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.15 2012/05/08 14:28:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $");
 #define	BFS_DEBUG
 
 #include <sys/param.h>
@@ -629,7 +629,7 @@ bfs_inode_set_attr(const struct bfs *bfs, struct bfs_inode *inode,
 	if (from != NULL) {
 		if (from->uid != (uid_t)-1)
 			to->uid = from->uid;
-		if (from->gid != (uid_t)-1)
+		if (from->gid != (gid_t)-1)
 			to->gid = from->gid;
 		if (from->mode != (mode_t)-1)
 			to->mode = from->mode;
diff --git a/sys/fs/sysvbfs/sysvbfs_vnops.c b/sys/fs/sysvbfs/sysvbfs_vnops.c
index bfc0da418c5c..22c3151c0a2b 100644
--- a/sys/fs/sysvbfs/sysvbfs_vnops.c
+++ b/sys/fs/sysvbfs/sysvbfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysvbfs_vnops.c,v 1.45 2012/05/08 14:28:55 tsutsui Exp $	*/
+/*	$NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.45 2012/05/08 14:28:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -350,7 +350,7 @@ sysvbfs_setattr(void *arg)
 	if (vap->va_flags != VNOVAL)
 		return EOPNOTSUPP;
 
-	if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (uid_t)VNOVAL) {
+	if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL) {
 		uid_t uid =
 		    (vap->va_uid != (uid_t)VNOVAL) ? vap->va_uid : attr->uid;
 		gid_t gid =