Author: kib
Date: Fri Jun 5 08:36:25 2015
New Revision: 284021
URL: https://svnweb.freebsd.org/changeset/base/284021
Log:
MFC r283735:
Remove several write-only variables.
Modified:
stable/10/sys/amd64/amd64/pmap.c
stable/10/sys/amd64/ia32/ia32_reg.c
stable/10/sys/dev/pci/pci.c
stable/10/sys/kern/kern_exit.c
stable/10/sys/kern/kern_synch.c
stable/10/sys/kern/vfs_cluster.c
stable/10/sys/kern/vfs_init.c
stable/10/sys/ufs/ffs/ffs_softdep.c
stable/10/sys/ufs/ffs/ffs_suspend.c
stable/10/sys/ufs/ffs/ffs_vfsops.c
stable/10/sys/ufs/ffs/ffs_vnops.c
stable/10/sys/ufs/ufs/ufs_bmap.c
stable/10/sys/ufs/ufs/ufs_dirhash.c
stable/10/sys/x86/iommu/busdma_dmar.c
stable/10/sys/x86/iommu/intel_idpgtbl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/10/sys/amd64/amd64/pmap.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/amd64/amd64/pmap.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -4020,7 +4020,6 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t
pd_entry_t newpde;
pt_entry_t *firstpte, oldpte, pa, *pte;
pt_entry_t PG_G, PG_A, PG_M, PG_RW, PG_V;
- vm_offset_t oldpteva;
vm_page_t mpte;
int PG_PTE_CACHE;
@@ -4080,10 +4079,9 @@ setpte:
if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW))
goto setpte;
oldpte &= ~PG_RW;
- oldpteva = (oldpte & PG_FRAME & PDRMASK) |
- (va & ~PDRMASK);
CTR2(KTR_PMAP, "pmap_promote_pde: protect for va %#lx"
- " in pmap %p", oldpteva, pmap);
+ " in pmap %p", (oldpte & PG_FRAME & PDRMASK) |
+ (va & ~PDRMASK), pmap);
}
if ((oldpte & PG_PTE_PROMOTE) != (newpde & PG_PTE_PROMOTE)) {
atomic_add_long(&pmap_pde_p_failures, 1);
Modified: stable/10/sys/amd64/ia32/ia32_reg.c
==============================================================================
--- stable/10/sys/amd64/ia32/ia32_reg.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/amd64/ia32/ia32_reg.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -79,11 +79,9 @@ __FBSDID("$FreeBSD$");
int
fill_regs32(struct thread *td, struct reg32 *regs)
{
- struct pcb *pcb;
struct trapframe *tp;
tp = td->td_frame;
- pcb = td->td_pcb;
if (tp->tf_flags & TF_HASSEGS) {
regs->r_gs = tp->tf_gs;
regs->r_fs = tp->tf_fs;
@@ -113,18 +111,16 @@ fill_regs32(struct thread *td, struct re
int
set_regs32(struct thread *td, struct reg32 *regs)
{
- struct pcb *pcb;
struct trapframe *tp;
tp = td->td_frame;
if (!EFL_SECURE(regs->r_eflags, tp->tf_rflags) ||
!CS_SECURE(regs->r_cs))
return (EINVAL);
- pcb = td->td_pcb;
tp->tf_gs = regs->r_gs;
tp->tf_fs = regs->r_fs;
tp->tf_es = regs->r_es;
tp->tf_ds = regs->r_ds;
- set_pcb_flags(pcb, PCB_FULL_IRET);
+ set_pcb_flags(td->td_pcb, PCB_FULL_IRET);
tp->tf_flags = TF_HASSEGS;
tp->tf_rdi = regs->r_edi;
tp->tf_rsi = regs->r_esi;
Modified: stable/10/sys/dev/pci/pci.c
==============================================================================
--- stable/10/sys/dev/pci/pci.c Fri Jun 5 08:26:38 2015 (r284020)
+++ stable/10/sys/dev/pci/pci.c Fri Jun 5 08:36:25 2015 (r284021)
@@ -2367,7 +2367,7 @@ pci_set_powerstate_method(device_t dev,
struct pci_devinfo *dinfo = device_get_ivars(child);
pcicfgregs *cfg = &dinfo->cfg;
uint16_t status;
- int result, oldstate, highest, delay;
+ int oldstate, highest, delay;
if (cfg->pp.pp_cap == 0)
return (EOPNOTSUPP);
@@ -2402,7 +2402,6 @@ pci_set_powerstate_method(device_t dev,
delay = 0;
status = PCI_READ_CONFIG(dev, child, cfg->pp.pp_status, 2)
& ~PCIM_PSTAT_DMASK;
- result = 0;
switch (state) {
case PCI_POWERSTATE_D0:
status |= PCIM_PSTAT_D0;
@@ -2962,7 +2961,6 @@ static void
pci_ata_maps(device_t bus, device_t dev, struct resource_list *rl, int force,
uint32_t prefetchmask)
{
- struct resource *r;
int rid, type, progif;
#if 0
/* if this device supports PCI native addressing use it */
@@ -2985,11 +2983,11 @@ pci_ata_maps(device_t bus, device_t dev,
} else {
rid = PCIR_BAR(0);
resource_list_add(rl, type, rid, 0x1f0, 0x1f7, 8);
- r = resource_list_reserve(rl, bus, dev, type, &rid, 0x1f0,
+ (void)resource_list_reserve(rl, bus, dev, type, &rid, 0x1f0,
0x1f7, 8, 0);
rid = PCIR_BAR(1);
resource_list_add(rl, type, rid, 0x3f6, 0x3f6, 1);
- r = resource_list_reserve(rl, bus, dev, type, &rid, 0x3f6,
+ (void)resource_list_reserve(rl, bus, dev, type, &rid, 0x3f6,
0x3f6, 1, 0);
}
if (progif & PCIP_STORAGE_IDE_MODESEC) {
@@ -3000,11 +2998,11 @@ pci_ata_maps(device_t bus, device_t dev,
} else {
rid = PCIR_BAR(2);
resource_list_add(rl, type, rid, 0x170, 0x177, 8);
- r = resource_list_reserve(rl, bus, dev, type, &rid, 0x170,
+ (void)resource_list_reserve(rl, bus, dev, type, &rid, 0x170,
0x177, 8, 0);
rid = PCIR_BAR(3);
resource_list_add(rl, type, rid, 0x376, 0x376, 1);
- r = resource_list_reserve(rl, bus, dev, type, &rid, 0x376,
+ (void)resource_list_reserve(rl, bus, dev, type, &rid, 0x376,
0x376, 1, 0);
}
pci_add_map(bus, dev, PCIR_BAR(4), rl, force,
@@ -3650,7 +3648,6 @@ pci_set_power_children(device_t dev, dev
int state)
{
device_t child, pcib;
- struct pci_devinfo *dinfo;
int dstate, i;
/*
@@ -3663,7 +3660,6 @@ pci_set_power_children(device_t dev, dev
pcib = device_get_parent(dev);
for (i = 0; i < numdevs; i++) {
child = devlist[i];
- dinfo = device_get_ivars(child);
dstate = state;
if (device_is_attached(child) &&
PCIB_POWER_FOR_SLEEP(pcib, dev, &dstate) == 0)
Modified: stable/10/sys/kern/kern_exit.c
==============================================================================
--- stable/10/sys/kern/kern_exit.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/kern/kern_exit.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -951,12 +951,10 @@ static int
proc_to_reap(struct thread *td, struct proc *p, idtype_t idtype, id_t id,
int *status, int options, struct __wrusage *wrusage, siginfo_t *siginfo)
{
- struct proc *q;
struct rusage *rup;
sx_assert(&proctree_lock, SA_XLOCKED);
- q = td->td_proc;
PROC_LOCK(p);
switch (idtype) {
Modified: stable/10/sys/kern/kern_synch.c
==============================================================================
--- stable/10/sys/kern/kern_synch.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/kern/kern_synch.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -432,11 +432,9 @@ mi_switch(int flags, struct thread *newt
{
uint64_t runtime, new_switchtime;
struct thread *td;
- struct proc *p;
td = curthread; /* XXX */
THREAD_LOCK_ASSERT(td, MA_OWNED | MA_NOTRECURSED);
- p = td->td_proc; /* XXX */
KASSERT(!TD_ON_RUNQ(td), ("mi_switch: called by old code"));
#ifdef INVARIANTS
if (!TD_ON_LOCK(td) && !TD_IS_RUNNING(td))
@@ -476,7 +474,7 @@ mi_switch(int flags, struct thread *newt
PCPU_INC(cnt.v_swtch);
PCPU_SET(switchticks, ticks);
CTR4(KTR_PROC, "mi_switch: old thread %ld (td_sched %p, pid %ld, %s)",
- td->td_tid, td->td_sched, p->p_pid, td->td_name);
+ td->td_tid, td->td_sched, td->td_proc->p_pid, td->td_name);
#if (KTR_COMPILE & KTR_SCHED) != 0
if (TD_IS_IDLETHREAD(td))
KTR_STATE1(KTR_SCHED, "thread", sched_tdname(td), "idle",
@@ -495,7 +493,7 @@ mi_switch(int flags, struct thread *newt
"prio:%d", td->td_priority);
CTR4(KTR_PROC, "mi_switch: new thread %ld (td_sched %p, pid %ld, %s)",
- td->td_tid, td->td_sched, p->p_pid, td->td_name);
+ td->td_tid, td->td_sched, td->td_proc->p_pid, td->td_name);
/*
* If the last thread was exiting, finish cleaning it up.
Modified: stable/10/sys/kern/vfs_cluster.c
==============================================================================
--- stable/10/sys/kern/vfs_cluster.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/kern/vfs_cluster.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -310,7 +310,6 @@ static struct buf *
cluster_rbuild(struct vnode *vp, u_quad_t filesize, daddr_t lbn,
daddr_t blkno, long size, int run, int gbflags, struct buf *fbp)
{
- struct bufobj *bo;
struct buf *bp, *tbp;
daddr_t bn;
off_t off;
@@ -376,7 +375,6 @@ cluster_rbuild(struct vnode *vp, u_quad_
bp->b_npages = 0;
inc = btodb(size);
- bo = &vp->v_bufobj;
for (bn = blkno, i = 0; i < run; ++i, bn += inc) {
if (i == 0) {
VM_OBJECT_WLOCK(tbp->b_bufobj->bo_object);
Modified: stable/10/sys/kern/vfs_init.c
==============================================================================
--- stable/10/sys/kern/vfs_init.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/kern/vfs_init.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -312,9 +312,7 @@ static int
vfs_unregister(struct vfsconf *vfc)
{
struct vfsconf *vfsp;
- int error, i, maxtypenum;
-
- i = vfc->vfc_typenum;
+ int error, maxtypenum;
vfsconf_lock();
vfsp = vfs_byname_locked(vfc->vfc_name);
Modified: stable/10/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_softdep.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/ufs/ffs/ffs_softdep.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -4692,12 +4692,10 @@ softdep_setup_dotdot_link(dp, ip)
struct inodedep *inodedep;
struct jaddref *jaddref;
struct vnode *dvp;
- struct vnode *vp;
KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
("softdep_setup_dotdot_link called on non-softdep filesystem"));
dvp = ITOV(dp);
- vp = ITOV(ip);
jaddref = NULL;
/*
* We don't set MKDIR_PARENT as this is not tied to a mkdir and
@@ -7066,7 +7064,6 @@ trunc_dependencies(ip, freeblks, lastlbn
struct bufobj *bo;
struct vnode *vp;
struct buf *bp;
- struct fs *fs;
int blkoff;
/*
@@ -7075,7 +7072,6 @@ trunc_dependencies(ip, freeblks, lastlbn
* Once they are all there, walk the list and get rid of
* any dependencies.
*/
- fs = ip->i_fs;
vp = ITOV(ip);
bo = &vp->v_bufobj;
BO_LOCK(bo);
@@ -9511,12 +9507,10 @@ handle_written_sbdep(sbdep, bp)
struct buf *bp;
{
struct inodedep *inodedep;
- struct mount *mp;
struct fs *fs;
LOCK_OWNED(sbdep->sb_ump);
fs = sbdep->sb_fs;
- mp = UFSTOVFS(sbdep->sb_ump);
/*
* If the superblock doesn't match the in-memory list start over.
*/
Modified: stable/10/sys/ufs/ffs/ffs_suspend.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_suspend.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/ufs/ffs/ffs_suspend.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -176,7 +176,6 @@ out:
static int
ffs_susp_suspend(struct mount *mp)
{
- struct fs *fs;
struct ufsmount *ump;
int error;
@@ -188,7 +187,6 @@ ffs_susp_suspend(struct mount *mp)
return (EBUSY);
ump = VFSTOUFS(mp);
- fs = ump->um_fs;
/*
* Make sure the calling thread is permitted to access the mounted
Modified: stable/10/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_vfsops.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/ufs/ffs/ffs_vfsops.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -1485,7 +1485,7 @@ ffs_sync(mp, waitfor)
struct inode *ip;
struct ufsmount *ump = VFSTOUFS(mp);
struct fs *fs;
- int error, count, wait, lockreq, allerror = 0;
+ int error, count, lockreq, allerror = 0;
int suspend;
int suspended;
int secondary_writes;
@@ -1494,7 +1494,6 @@ ffs_sync(mp, waitfor)
int softdep_accdeps;
struct bufobj *bo;
- wait = 0;
suspend = 0;
suspended = 0;
td = curthread;
@@ -1516,10 +1515,8 @@ ffs_sync(mp, waitfor)
suspend = 1;
waitfor = MNT_WAIT;
}
- if (waitfor == MNT_WAIT) {
- wait = 1;
+ if (waitfor == MNT_WAIT)
lockreq = LK_EXCLUSIVE;
- }
lockreq |= LK_INTERLOCK | LK_SLEEPFAIL;
loop:
/* Grab snapshot of secondary write counts */
@@ -2023,7 +2020,6 @@ static int
ffs_bufwrite(struct buf *bp)
{
struct buf *newbp;
- int oldflags;
CTR3(KTR_BUF, "bufwrite(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags);
if (bp->b_flags & B_INVAL) {
@@ -2031,8 +2027,6 @@ ffs_bufwrite(struct buf *bp)
return (0);
}
- oldflags = bp->b_flags;
-
if (!BUF_ISLOCKED(bp))
panic("bufwrite: buffer is not busy???");
/*
Modified: stable/10/sys/ufs/ffs/ffs_vnops.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_vnops.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/ufs/ffs/ffs_vnops.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -1407,11 +1407,6 @@ struct vop_openextattr_args {
};
*/
{
- struct inode *ip;
- struct fs *fs;
-
- ip = VTOI(ap->a_vp);
- fs = ip->i_fs;
if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
return (EOPNOTSUPP);
@@ -1435,11 +1430,6 @@ struct vop_closeextattr_args {
};
*/
{
- struct inode *ip;
- struct fs *fs;
-
- ip = VTOI(ap->a_vp);
- fs = ip->i_fs;
if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
return (EOPNOTSUPP);
@@ -1553,13 +1543,11 @@ vop_getextattr {
*/
{
struct inode *ip;
- struct fs *fs;
u_char *eae, *p;
unsigned easize;
int error, ealen;
ip = VTOI(ap->a_vp);
- fs = ip->i_fs;
if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
return (EOPNOTSUPP);
@@ -1608,14 +1596,12 @@ vop_listextattr {
*/
{
struct inode *ip;
- struct fs *fs;
u_char *eae, *p, *pe, *pn;
unsigned easize;
uint32_t ul;
int error, ealen;
ip = VTOI(ap->a_vp);
- fs = ip->i_fs;
if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
return (EOPNOTSUPP);
Modified: stable/10/sys/ufs/ufs/ufs_bmap.c
==============================================================================
--- stable/10/sys/ufs/ufs/ufs_bmap.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/ufs/ufs/ufs_bmap.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -114,7 +114,6 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, ru
struct buf *bp;
struct ufsmount *ump;
struct mount *mp;
- struct vnode *devvp;
struct indir a[NIADDR+1], *ap;
ufs2_daddr_t daddr;
ufs_lbn_t metalbn;
@@ -125,7 +124,6 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, ru
ip = VTOI(vp);
mp = vp->v_mount;
ump = VFSTOUFS(mp);
- devvp = ump->um_devvp;
if (runp) {
maxrun = mp->mnt_iosize_max / mp->mnt_stat.f_iosize - 1;
Modified: stable/10/sys/ufs/ufs/ufs_dirhash.c
==============================================================================
--- stable/10/sys/ufs/ufs/ufs_dirhash.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/ufs/ufs/ufs_dirhash.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -189,9 +189,7 @@ ufsdirhash_create(struct inode *ip)
struct dirhash *ndh;
struct dirhash *dh;
struct vnode *vp;
- int error;
- error = 0;
ndh = dh = NULL;
vp = ip->i_vnode;
for (;;) {
@@ -273,11 +271,9 @@ static struct dirhash *
ufsdirhash_acquire(struct inode *ip)
{
struct dirhash *dh;
- struct vnode *vp;
ASSERT_VOP_ELOCKED(ip->i_vnode, __FUNCTION__);
- vp = ip->i_vnode;
dh = ip->i_dirhash;
if (dh == NULL)
return (NULL);
Modified: stable/10/sys/x86/iommu/busdma_dmar.c
==============================================================================
--- stable/10/sys/x86/iommu/busdma_dmar.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/x86/iommu/busdma_dmar.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -815,7 +815,6 @@ dmar_bus_task_dmamap(void *arg, int pend
struct bus_dma_tag_dmar *tag;
struct bus_dmamap_dmar *map;
struct dmar_unit *unit;
- struct dmar_ctx *ctx;
unit = arg;
DMAR_LOCK(unit);
@@ -823,7 +822,6 @@ dmar_bus_task_dmamap(void *arg, int pend
TAILQ_REMOVE(&unit->delayed_maps, map, delay_link);
DMAR_UNLOCK(unit);
tag = map->tag;
- ctx = map->tag->ctx;
map->cansleep = true;
map->locked = false;
bus_dmamap_load_mem((bus_dma_tag_t)tag, (bus_dmamap_t)map,
@@ -844,9 +842,7 @@ dmar_bus_task_dmamap(void *arg, int pend
static void
dmar_bus_schedule_dmamap(struct dmar_unit *unit, struct bus_dmamap_dmar *map)
{
- struct dmar_ctx *ctx;
- ctx = map->tag->ctx;
map->locked = false;
DMAR_LOCK(unit);
TAILQ_INSERT_TAIL(&unit->delayed_maps, map, delay_link);
Modified: stable/10/sys/x86/iommu/intel_idpgtbl.c
==============================================================================
--- stable/10/sys/x86/iommu/intel_idpgtbl.c Fri Jun 5 08:26:38 2015
(r284020)
+++ stable/10/sys/x86/iommu/intel_idpgtbl.c Fri Jun 5 08:36:25 2015
(r284021)
@@ -107,7 +107,7 @@ static void
ctx_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx,
dmar_gaddr_t addr)
{
- vm_page_t m, m1;
+ vm_page_t m1;
dmar_pte_t *pte;
struct sf_buf *sf;
dmar_gaddr_t f, pg_sz;
@@ -117,7 +117,7 @@ ctx_idmap_nextlvl(struct idpgtbl *tbl, i
VM_OBJECT_ASSERT_LOCKED(tbl->pgtbl_obj);
if (addr >= tbl->maxaddr)
return;
- m = dmar_pgalloc(tbl->pgtbl_obj, idx, DMAR_PGF_OBJL | DMAR_PGF_WAITOK |
+ (void)dmar_pgalloc(tbl->pgtbl_obj, idx, DMAR_PGF_OBJL | DMAR_PGF_WAITOK
|
DMAR_PGF_ZERO);
base = idx * DMAR_NPTEPG + 1; /* Index of the first child page of idx */
pg_sz = pglvl_page_size(tbl->pglvl, lvl);
@@ -597,7 +597,7 @@ ctx_unmap_buf_locked(struct dmar_ctx *ct
dmar_pte_t *pte;
struct sf_buf *sf;
vm_pindex_t idx;
- dmar_gaddr_t pg_sz, base1, size1;
+ dmar_gaddr_t pg_sz;
int lvl;
DMAR_CTX_ASSERT_PGLOCKED(ctx);
@@ -624,8 +624,6 @@ ctx_unmap_buf_locked(struct dmar_ctx *ct
KASSERT((flags & ~DMAR_PGF_WAITOK) == 0, ("invalid flags %x", flags));
pg_sz = 0; /* silence gcc */
- base1 = base;
- size1 = size;
flags |= DMAR_PGF_OBJL;
TD_PREP_PINNED_ASSERT;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
