svn commit: r187959 - in head/sys/fs: coda devfs hpfs nullfs nwfs
tmpfs udf
Bjoern A. Zeeb
bz at FreeBSD.org
Sat Jan 31 09:36:23 PST 2009
Author: bz
Date: Sat Jan 31 17:36:22 2009
New Revision: 187959
URL: http://svn.freebsd.org/changeset/base/187959
Log:
Remove unused local variables.
Submitted by: Christoph Mallon christoph.mallon at gmx.de
Reviewed by: kib
MFC after: 2 weeks
Modified:
head/sys/fs/coda/coda_vfsops.c
head/sys/fs/devfs/devfs_vnops.c
head/sys/fs/hpfs/hpfs_vfsops.c
head/sys/fs/nullfs/null_vnops.c
head/sys/fs/nwfs/nwfs_subr.c
head/sys/fs/nwfs/nwfs_vnops.c
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/udf/udf_vnops.c
Modified: head/sys/fs/coda/coda_vfsops.c
==============================================================================
--- head/sys/fs/coda/coda_vfsops.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/coda/coda_vfsops.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -266,7 +266,6 @@ coda_root(struct mount *vfsp, int flags,
struct thread *td)
{
struct coda_mntinfo *mi = vftomi(vfsp);
- struct vnode **result;
int error;
struct proc *p = td->td_proc;
CodaFid VFid;
@@ -274,7 +273,6 @@ coda_root(struct mount *vfsp, int flags,
ENTRY;
MARK_ENTRY(CODA_ROOT_STATS);
- result = NULL;
if (vfsp == mi->mi_vfsp) {
/*
* Cache the root across calls. We only need to pass the
Modified: head/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- head/sys/fs/devfs/devfs_vnops.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/devfs/devfs_vnops.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -1074,7 +1074,7 @@ devfs_readdir(struct vop_readdir_args *a
struct devfs_dirent *dd;
struct devfs_dirent *de;
struct devfs_mount *dmp;
- off_t off, oldoff;
+ off_t off;
int *tmp_ncookies = NULL;
if (ap->a_vp->v_type != VDIR)
@@ -1113,7 +1113,6 @@ devfs_readdir(struct vop_readdir_args *a
error = 0;
de = ap->a_vp->v_data;
off = 0;
- oldoff = uio->uio_offset;
TAILQ_FOREACH(dd, &de->de_dlist, de_list) {
KASSERT(dd->de_cdp != (void *)0xdeadc0de, ("%s %d\n", __func__, __LINE__));
if (dd->de_flags & DE_WHITEOUT)
Modified: head/sys/fs/hpfs/hpfs_vfsops.c
==============================================================================
--- head/sys/fs/hpfs/hpfs_vfsops.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/hpfs/hpfs_vfsops.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -109,7 +109,6 @@ hpfs_mount (
{
int err = 0, error;
struct vnode *devvp;
- struct hpfsmount *hpmp = 0;
struct nameidata ndp;
struct export_args export;
char *from;
@@ -134,8 +133,6 @@ hpfs_mount (
if (mp->mnt_flag & MNT_UPDATE) {
dprintf(("hpfs_omount: MNT_UPDATE: "));
- hpmp = VFSTOHPFS(mp);
-
if (from == NULL) {
error = vfs_copyopt(mp->mnt_optnew, "export",
&export, sizeof export);
@@ -337,13 +334,11 @@ hpfs_unmount(
int mntflags,
struct thread *td)
{
- int error, flags, ronly;
+ int error, flags;
register struct hpfsmount *hpmp = VFSTOHPFS(mp);
dprintf(("hpfs_unmount():\n"));
- ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
-
flags = 0;
if(mntflags & MNT_FORCE)
flags |= FORCECLOSE;
Modified: head/sys/fs/nullfs/null_vnops.c
==============================================================================
--- head/sys/fs/nullfs/null_vnops.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/nullfs/null_vnops.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -658,7 +658,6 @@ null_reclaim(struct vop_reclaim_args *ap
struct vnode *vp = ap->a_vp;
struct null_node *xp = VTONULL(vp);
struct vnode *lowervp = xp->null_lowervp;
- struct lock *vnlock;
if (lowervp)
null_hashrem(xp);
@@ -669,7 +668,6 @@ null_reclaim(struct vop_reclaim_args *ap
VI_LOCK(vp);
vp->v_data = NULL;
vp->v_object = NULL;
- vnlock = vp->v_vnlock;
vp->v_vnlock = &vp->v_lock;
if (lowervp) {
lockmgr(vp->v_vnlock, LK_EXCLUSIVE | LK_INTERLOCK, VI_MTX(vp));
Modified: head/sys/fs/nwfs/nwfs_subr.c
==============================================================================
--- head/sys/fs/nwfs/nwfs_subr.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/nwfs/nwfs_subr.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -179,7 +179,6 @@ ncp_lookup(struct vnode *dvp, int len, c
{
struct nwmount *nmp;
struct nwnode *dnp;
- struct ncp_conn *conn;
int error;
if (!dvp || dvp->v_type != VDIR) {
@@ -188,7 +187,6 @@ ncp_lookup(struct vnode *dvp, int len, c
}
dnp = VTONW(dvp);
nmp = VTONWFS(dvp);
- conn = NWFSTOCONN(nmp);
if (len == 1 && name[0] == '.') {
if (dnp->n_flag & NVOLUME) {
Modified: head/sys/fs/nwfs/nwfs_vnops.c
==============================================================================
--- head/sys/fs/nwfs/nwfs_vnops.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/nwfs/nwfs_vnops.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -627,7 +627,6 @@ nwfs_mkdir(ap)
struct componentname *cnp = ap->a_cnp;
int len=cnp->cn_namelen;
struct ncp_open_info no;
- struct nwnode *np;
struct vnode *newvp = (struct vnode *)0;
ncpfid fid;
int error = 0;
@@ -651,7 +650,6 @@ nwfs_mkdir(ap)
fid.f_id = no.fattr.dirEntNum;
error = nwfs_nget(VTOVFS(dvp), fid, &no.fattr, dvp, &newvp);
if (!error) {
- np = VTONW(newvp);
newvp->v_type = VDIR;
*ap->a_vpp = newvp;
}
Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/tmpfs/tmpfs_subr.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -1259,12 +1259,10 @@ tmpfs_update(struct vnode *vp)
int
tmpfs_truncate(struct vnode *vp, off_t length)
{
- boolean_t extended;
int error;
struct tmpfs_node *node;
node = VP_TO_TMPFS_NODE(vp);
- extended = length > node->tn_size;
if (length < 0) {
error = EINVAL;
Modified: head/sys/fs/udf/udf_vnops.c
==============================================================================
--- head/sys/fs/udf/udf_vnops.c Sat Jan 31 17:35:44 2009 (r187958)
+++ head/sys/fs/udf/udf_vnops.c Sat Jan 31 17:36:22 2009 (r187959)
@@ -892,7 +892,6 @@ udf_lookup(struct vop_cachedlookup_args
struct udf_mnt *udfmp;
struct fileid_desc *fid = NULL;
struct udf_dirstream *ds;
- struct thread *td;
u_long nameiop;
u_long flags;
char *nameptr;
@@ -909,7 +908,6 @@ udf_lookup(struct vop_cachedlookup_args
nameptr = a->a_cnp->cn_nameptr;
namelen = a->a_cnp->cn_namelen;
fsize = le64toh(node->fentry->inf_len);
- td = a->a_cnp->cn_thread;
/*
* If this is a LOOKUP and we've already partially searched through
More information about the svn-src-all
mailing list