Module Name: src
Committed By: christos
Date: Thu Oct 17 21:01:08 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs_inode.c lfs_segment.c lfs_vfsops.c lfs_vnops.c
ulfs_bswap.h ulfs_lookup.c ulfs_readwrite.c
Log Message:
- remove unused variables
- add debug ifdefs for debugging variables
- __USE() where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/ufs/lfs/lfs_inode.c
cvs rdiff -u -r1.231 -r1.232 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.314 -r1.315 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.257 -r1.258 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/lfs/ulfs_bswap.h
cvs rdiff -u -r1.15 -r1.16 src/sys/ufs/lfs/ulfs_lookup.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/ulfs_readwrite.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/lfs/lfs_inode.c
diff -u src/sys/ufs/lfs/lfs_inode.c:1.135 src/sys/ufs/lfs/lfs_inode.c:1.136
--- src/sys/ufs/lfs/lfs_inode.c:1.135 Sat Jul 27 21:25:06 2013
+++ src/sys/ufs/lfs/lfs_inode.c Thu Oct 17 17:01:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.c,v 1.135 2013/07/28 01:25:06 dholland Exp $ */
+/* $NetBSD: lfs_inode.c,v 1.136 2013/10/17 21:01:08 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.135 2013/07/28 01:25:06 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.136 2013/10/17 21:01:08 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -627,13 +627,11 @@ static int
lfs_update_seguse(struct lfs *fs, struct inode *ip, long lastseg, size_t num)
{
struct segdelta *sd;
- struct vnode *vp;
ASSERT_SEGLOCK(fs);
if (lastseg < 0 || num == 0)
return 0;
- vp = ITOV(ip);
LIST_FOREACH(sd, &ip->i_lfs_segdhd, list)
if (sd->segnum == lastseg)
break;
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.231 src/sys/ufs/lfs/lfs_segment.c:1.232
--- src/sys/ufs/lfs/lfs_segment.c:1.231 Sat Jul 27 21:05:52 2013
+++ src/sys/ufs/lfs/lfs_segment.c Thu Oct 17 17:01:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.231 2013/07/28 01:05:52 dholland Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.232 2013/10/17 21:01:08 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.231 2013/07/28 01:05:52 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.232 2013/10/17 21:01:08 christos Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -195,7 +195,6 @@ lfs_vflush(struct vnode *vp)
int error;
int flushed;
int relock;
- int loopcount;
ip = VTOI(vp);
fs = VFSTOULFS(vp->v_mount)->um_lfs;
@@ -382,7 +381,9 @@ lfs_vflush(struct vnode *vp)
#endif
do {
- loopcount = 0;
+#ifdef DEBUG
+ int loopcount = 0;
+#endif
do {
if (LIST_FIRST(&vp->v_dirtyblkhd) != NULL) {
relock = lfs_writefile(fs, sp, vp);
@@ -623,7 +624,6 @@ lfs_segwrite(struct mount *mp, int flags
int dirty;
int redo;
int um_error;
- int loopcount;
fs = VFSTOULFS(mp)->um_lfs;
ASSERT_MAYBE_SEGLOCK(fs);
@@ -734,7 +734,9 @@ lfs_segwrite(struct mount *mp, int flags
did_ckp = 0;
if (do_ckp || fs->lfs_doifile) {
vp = fs->lfs_ivnode;
- loopcount = 0;
+#ifdef DEBUG
+ int loopcount = 0;
+#endif
do {
#ifdef DEBUG
LFS_ENTER_LOG("pretend", __FILE__, __LINE__, 0, 0, curproc->p_pid);
@@ -844,7 +846,6 @@ lfs_segwrite(struct mount *mp, int flags
int
lfs_writefile(struct lfs *fs, struct segment *sp, struct vnode *vp)
{
- struct finfo *fip;
struct inode *ip;
int i, frag;
int error;
@@ -853,7 +854,6 @@ lfs_writefile(struct lfs *fs, struct seg
error = 0;
ip = VTOI(vp);
- fip = sp->fip;
lfs_acquire_finfo(fs, ip->i_number, ip->i_gen);
if (vp->v_uflag & VU_DIROP)
@@ -923,7 +923,6 @@ lfs_writefile(struct lfs *fs, struct seg
lfs_gather(fs, sp, vp, lfs_match_dindir);
lfs_gather(fs, sp, vp, lfs_match_tindir);
}
- fip = sp->fip;
lfs_release_finfo(fs);
return error;
@@ -940,7 +939,7 @@ lfs_update_iaddr(struct lfs *fs, struct
IFILE *ifp;
SEGUSE *sup;
ino_t ino;
- int redo_ifile, error;
+ int redo_ifile;
u_int32_t sn;
redo_ifile = 0;
@@ -957,7 +956,7 @@ lfs_update_iaddr(struct lfs *fs, struct
LFS_IENTRY(ifp, fs, ino, bp);
daddr = ifp->if_daddr;
ifp->if_daddr = LFS_DBTOFSB(fs, ndaddr);
- error = LFS_BWRITE_LOG(bp); /* Ifile */
+ (void)LFS_BWRITE_LOG(bp); /* Ifile */
}
/*
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.314 src/sys/ufs/lfs/lfs_vfsops.c:1.315
--- src/sys/ufs/lfs/lfs_vfsops.c:1.314 Mon Sep 30 14:58:00 2013
+++ src/sys/ufs/lfs/lfs_vfsops.c Thu Oct 17 17:01:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.314 2013/09/30 18:58:00 hannken Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.315 2013/10/17 21:01:08 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.314 2013/09/30 18:58:00 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.315 2013/10/17 21:01:08 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -394,7 +394,6 @@ lfs_writerd(void *arg)
struct lfs *fs;
struct vfsops *vfs = NULL;
int fsflags;
- int loopcount;
int skipc;
int lfsc;
int wrote_something = 0;
@@ -415,7 +414,6 @@ lfs_writerd(void *arg)
&lfs_lock);
KASSERT(mutex_owned(&lfs_lock));
- loopcount = 0;
wrote_something = 0;
/*
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.257 src/sys/ufs/lfs/lfs_vnops.c:1.258
--- src/sys/ufs/lfs/lfs_vnops.c:1.257 Mon Jul 29 12:40:46 2013
+++ src/sys/ufs/lfs/lfs_vnops.c Thu Oct 17 17:01:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.257 2013/07/29 16:40:46 dholland Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.258 2013/10/17 21:01:08 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.257 2013/07/29 16:40:46 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.258 2013/10/17 21:01:08 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1391,7 +1391,7 @@ lfs_fcntl(void *v)
BLOCK_INFO *blkiov;
CLEANERINFO *cip;
SEGUSE *sup;
- int blkcnt, error, oclean;
+ int blkcnt, error;
size_t fh_size;
struct lfs_fcntl_markv blkvp;
struct lwp *l;
@@ -1400,6 +1400,7 @@ lfs_fcntl(void *v)
struct buf *bp;
fhandle_t *fhp;
daddr_t off;
+ int oclean;
/* Only respect LFS fcntls on fs root or Ifile */
if (VTOI(ap->a_vp)->i_number != ULFS_ROOTINO &&
@@ -1510,6 +1511,9 @@ segwait_common:
fs->lfs_offset - off, cip->clean - oclean,
fs->lfs_activesb));
LFS_SYNC_CLEANERINFO(cip, fs, bp, 0);
+#else
+ __USE(oclean);
+ __USE(off);
#endif
return 0;
Index: src/sys/ufs/lfs/ulfs_bswap.h
diff -u src/sys/ufs/lfs/ulfs_bswap.h:1.4 src/sys/ufs/lfs/ulfs_bswap.h:1.5
--- src/sys/ufs/lfs/ulfs_bswap.h:1.4 Sat Jul 27 21:10:49 2013
+++ src/sys/ufs/lfs/ulfs_bswap.h Thu Oct 17 17:01:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_bswap.h,v 1.4 2013/07/28 01:10:49 dholland Exp $ */
+/* $NetBSD: ulfs_bswap.h,v 1.5 2013/10/17 21:01:08 christos Exp $ */
/* from NetBSD: ufs_bswap.h,v 1.19 2009/10/19 18:41:17 bouyer Exp */
/*
@@ -66,9 +66,9 @@ ulfs_rw64(uint64_t a, int ns)
return ((ns) ? bswap64(a) : (a));
}
#else
-#define ulfs_rw16(a, ns) ((uint16_t)(a))
-#define ulfs_rw32(a, ns) ((uint32_t)(a))
-#define ulfs_rw64(a, ns) ((uint64_t)(a))
+#define ulfs_rw16(a, ns) (__USE(ns), (uint16_t)(a))
+#define ulfs_rw32(a, ns) (__USE(ns), (uint32_t)(a))
+#define ulfs_rw64(a, ns) (__USE(ns), (uint64_t)(a))
#endif
#define ulfs_add16(a, b, ns) \
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.15 src/sys/ufs/lfs/ulfs_lookup.c:1.16
--- src/sys/ufs/lfs/ulfs_lookup.c:1.15 Sat Jul 27 21:10:49 2013
+++ src/sys/ufs/lfs/ulfs_lookup.c Thu Oct 17 17:01:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_lookup.c,v 1.15 2013/07/28 01:10:49 dholland Exp $ */
+/* $NetBSD: ulfs_lookup.c,v 1.16 2013/10/17 21:01:08 christos Exp $ */
/* from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.15 2013/07/28 01:10:49 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.16 2013/10/17 21:01:08 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_lfs.h"
@@ -814,7 +814,6 @@ ulfs_direnter(struct vnode *dvp, const s
struct componentname *cnp, struct buf *newdirbp)
{
kauth_cred_t cr;
- struct lwp *l;
int newentrysize;
struct inode *dp;
struct buf *bp;
@@ -830,7 +829,6 @@ ulfs_direnter(struct vnode *dvp, const s
error = 0;
cr = cnp->cn_cred;
- l = curlwp;
dp = VTOI(dvp);
newentrysize = LFS_DIRSIZ(0, dirp, 0);
@@ -1068,9 +1066,7 @@ ulfs_dirremove(struct vnode *dvp, const
struct lfs_direct *ep;
struct buf *bp;
int error;
-#ifdef LFS_EI
const int needswap = ULFS_MPNEEDSWAP(dp->i_lfs);
-#endif
if (flags & DOWHITEOUT) {
/*
Index: src/sys/ufs/lfs/ulfs_readwrite.c
diff -u src/sys/ufs/lfs/ulfs_readwrite.c:1.6 src/sys/ufs/lfs/ulfs_readwrite.c:1.7
--- src/sys/ufs/lfs/ulfs_readwrite.c:1.6 Sat Jul 27 21:10:49 2013
+++ src/sys/ufs/lfs/ulfs_readwrite.c Thu Oct 17 17:01:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_readwrite.c,v 1.6 2013/07/28 01:10:49 dholland Exp $ */
+/* $NetBSD: ulfs_readwrite.c,v 1.7 2013/10/17 21:01:08 christos Exp $ */
/* from NetBSD: ufs_readwrite.c,v 1.105 2013/01/22 09:39:18 dholland Exp */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.6 2013/07/28 01:10:49 dholland Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.7 2013/10/17 21:01:08 christos Exp $");
#ifdef LFS_READWRITE
#define FS struct lfs
@@ -69,7 +69,6 @@ READ(void *v)
struct vnode *vp;
struct inode *ip;
struct uio *uio;
- struct ulfsmount *ump;
struct buf *bp;
FS *fs;
vsize_t bytelen;
@@ -81,7 +80,6 @@ READ(void *v)
vp = ap->a_vp;
ip = VTOI(vp);
- ump = ip->i_ump;
fs = ip->I_FS;
uio = ap->a_uio;
ioflag = ap->a_ioflag;
@@ -220,14 +218,12 @@ WRITE(void *v)
#ifdef LFS_READWRITE
bool need_unreserve = false;
#endif
- struct ulfsmount *ump;
cred = ap->a_cred;
ioflag = ap->a_ioflag;
uio = ap->a_uio;
vp = ap->a_vp;
ip = VTOI(vp);
- ump = ip->i_ump;
KASSERT(vp->v_size == ip->i_size);
#ifdef DIAGNOSTIC
@@ -406,6 +402,8 @@ WRITE(void *v)
if (error)
break;
}
+#else
+ __USE(async);
#endif
}
if (error == 0 && ioflag & IO_SYNC) {
