Module Name: src
Committed By: christos
Date: Sun Oct 20 17:18:38 UTC 2013
Modified Files:
src/sys/ufs/chfs: chfs_gc.c chfs_readinode.c chfs_subr.c chfs_vfsops.c
chfs_vnops.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_gc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/chfs/chfs_readinode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.17 -r1.18 src/sys/ufs/chfs/chfs_vnops.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/chfs/chfs_gc.c
diff -u src/sys/ufs/chfs/chfs_gc.c:1.4 src/sys/ufs/chfs/chfs_gc.c:1.5
--- src/sys/ufs/chfs/chfs_gc.c:1.4 Fri Oct 19 08:44:39 2012
+++ src/sys/ufs/chfs/chfs_gc.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_gc.c,v 1.4 2012/10/19 12:44:39 ttoth Exp $ */
+/* $NetBSD: chfs_gc.c,v 1.5 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -985,8 +985,6 @@ chfs_gcollect_deletion_dirent(struct chf
int ret;
- struct vnode *vnode = NULL;
-
dbg_gc("gcollect_deletion_dirent\n");
/* Check node. */
@@ -995,7 +993,7 @@ chfs_gcollect_deletion_dirent(struct chf
nref_len = chfs_nref_len(chmp, cheb, fd->nref);
- vnode = chfs_vnode_lookup(chmp, fd->vno);
+ (void)chfs_vnode_lookup(chmp, fd->vno);
/* Find it in parent dirents. */
for (nref = parent->chvc->dirents;
Index: src/sys/ufs/chfs/chfs_readinode.c
diff -u src/sys/ufs/chfs/chfs_readinode.c:1.7 src/sys/ufs/chfs/chfs_readinode.c:1.8
--- src/sys/ufs/chfs/chfs_readinode.c:1.7 Sat Dec 1 06:31:01 2012
+++ src/sys/ufs/chfs/chfs_readinode.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_readinode.c,v 1.7 2012/12/01 11:31:01 mbalmer Exp $ */
+/* $NetBSD: chfs_readinode.c,v 1.8 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -507,7 +507,6 @@ no_overlapping_node(struct rb_tree *frag
}
rb_tree_insert_node(fragtree, holefrag);
- this = holefrag;
}
rb_tree_insert_node(fragtree, newfrag);
Index: src/sys/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.8 src/sys/ufs/chfs/chfs_subr.c:1.9
--- src/sys/ufs/chfs/chfs_subr.c:1.8 Fri Oct 19 08:44:39 2012
+++ src/sys/ufs/chfs/chfs_subr.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_subr.c,v 1.8 2012/10/19 12:44:39 ttoth Exp $ */
+/* $NetBSD: chfs_subr.c,v 1.9 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -253,14 +253,12 @@ chfs_chsize(struct vnode *vp, u_quad_t s
int
chfs_chflags(struct vnode *vp, int flags, kauth_cred_t cred)
{
- struct chfs_mount *chmp;
struct chfs_inode *ip;
int error = 0;
kauth_action_t action = KAUTH_VNODE_WRITE_FLAGS;
bool changing_sysflags = false;
ip = VTOI(vp);
- chmp = ip->chmp;
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return EROFS;
Index: src/sys/ufs/chfs/chfs_vfsops.c
diff -u src/sys/ufs/chfs/chfs_vfsops.c:1.8 src/sys/ufs/chfs/chfs_vfsops.c:1.9
--- src/sys/ufs/chfs/chfs_vfsops.c:1.8 Mon Sep 30 14:58:00 2013
+++ src/sys/ufs/chfs/chfs_vfsops.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vfsops.c,v 1.8 2013/09/30 18:58:00 hannken Exp $ */
+/* $NetBSD: chfs_vfsops.c,v 1.9 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -204,7 +204,6 @@ int
chfs_mountfs(struct vnode *devvp, struct mount *mp)
{
struct lwp *l = curlwp;
- struct proc *p;
kauth_cred_t cred;
devmajor_t flash_major;
dev_t dev;
@@ -216,7 +215,6 @@ chfs_mountfs(struct vnode *devvp, struct
dbg("mountfs()\n");
dev = devvp->v_rdev;
- p = l ? l->l_proc : NULL;
cred = l ? l->l_cred : NOCRED;
/* Flush out any old buffers remaining from a previous use. */
Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.17 src/sys/ufs/chfs/chfs_vnops.c:1.18
--- src/sys/ufs/chfs/chfs_vnops.c:1.17 Sun Jun 23 03:28:37 2013
+++ src/sys/ufs/chfs/chfs_vnops.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnops.c,v 1.17 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: chfs_vnops.c,v 1.18 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -217,7 +217,6 @@ chfs_mknod(void *v)
struct ufsmount *ump;
struct chfs_mount *chmp;
- ino_t ino;
struct chfs_full_dnode *fd;
struct buf *bp;
@@ -255,7 +254,6 @@ chfs_mknod(void *v)
err = chfs_makeinode(mode, dvp, &vp, cnp, vap->va_type);
ip = VTOI(vp);
- ino = ip->ino;
if (vap->va_rdev != VNOVAL)
ip->rdev = vap->va_rdev;
