Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F95900680
D32577.id97167.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
6 KB
Referenced Files
None
Subscribers
None
D32577.id97167.diff
View Options
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -941,14 +941,12 @@
struct componentname *fcnp, *tcnp;
struct denode *fdip, *fip, *tdip, *tip, *nip;
u_char toname[12], oldname[11];
- u_long from_diroffset, to_diroffset;
+ u_long to_diroffset;
bool checkpath_locked, doingdirectory, newparent;
- u_char to_count;
int error;
u_long cn, pcl, blkoff;
daddr_t bn, wait_scn, scn;
struct msdosfsmount *pmp;
- struct mount *mp;
struct direntry *dotdotp;
struct buf *bp;
@@ -968,7 +966,6 @@
/*
* Check for cross-device rename.
*/
- mp = fvp->v_mount;
if (fvp->v_mount != tdvp->v_mount ||
(tvp != NULL && fvp->v_mount != tvp->v_mount)) {
error = EXDEV;
@@ -1031,7 +1028,6 @@
}
vrele(fvp);
fvp = DETOV(nip);
- from_diroffset = fdip->de_fndoffset;
error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff);
if (error != 0 && error != EJUSTRETURN) {
@@ -1077,7 +1073,6 @@
* Remember direntry place to use for destination
*/
to_diroffset = tdip->de_fndoffset;
- to_count = tdip->de_fndcnt;
/*
* Be sure we are not renaming ".", "..", or an alias of ".". This
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
--- a/sys/fs/tmpfs/tmpfs_subr.c
+++ b/sys/fs/tmpfs/tmpfs_subr.c
@@ -454,7 +454,6 @@
const char *target, dev_t rdev, struct tmpfs_node **node)
{
struct tmpfs_node *nnode;
- vm_object_t obj;
char *symlink;
char symlink_smr;
@@ -566,7 +565,7 @@
break;
case VREG:
- obj = nnode->tn_reg.tn_aobj =
+ nnode->tn_reg.tn_aobj =
vm_pager_allocate(tmpfs_pager_type, NULL, 0,
VM_PROT_DEFAULT, 0,
NULL /* XXXKIB - tmpfs needs swap reservation */);
@@ -1785,7 +1784,6 @@
int
tmpfs_reg_punch_hole(struct vnode *vp, off_t *offset, off_t *length)
{
- struct tmpfs_mount *tmp;
struct tmpfs_node *node;
vm_object_t object;
vm_pindex_t pistart, pi, piend;
@@ -1799,7 +1797,6 @@
KASSERT(node->tn_type == VREG, ("%s: node is not regular file",
__func__));
object = node->tn_reg.tn_aobj;
- tmp = VFS_TO_TMPFS(vp->v_mount);
off = *offset;
len = omin(node->tn_size - off, *length);
startofs = off & PAGE_MASK;
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -244,8 +244,8 @@
ufs2_daddr_t bn, lbn, lastblock, lastiblock[UFS_NIADDR];
ufs2_daddr_t indir_lbn[UFS_NIADDR], oldblks[UFS_NDADDR + UFS_NIADDR];
ufs2_daddr_t newblks[UFS_NDADDR + UFS_NIADDR];
- ufs2_daddr_t count, blocksreleased = 0, datablocks, blkno;
- struct bufobj *bo;
+ ufs2_daddr_t count, blocksreleased = 0, blkno;
+ struct bufobj *bo __diagused;
struct fs *fs;
struct buf *bp;
struct ufsmount *ump;
@@ -297,10 +297,8 @@
if (journaltrunc == 0 && DOINGSOFTDEP(vp) && length == 0)
softdeptrunc = !softdep_slowdown(vp);
extblocks = 0;
- datablocks = DIP(ip, i_blocks);
if (fs->fs_magic == FS_UFS2_MAGIC && ip->i_din2->di_extsize > 0) {
extblocks = btodb(fragroundup(fs, ip->i_din2->di_extsize));
- datablocks -= extblocks;
}
if ((flags & IO_EXT) && extblocks > 0) {
if (length != 0)
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -5064,7 +5064,7 @@
struct inode *ip;
{
struct inodedep *inodedep;
- struct jaddref *jaddref;
+ struct jaddref *jaddref __diagused;
struct vnode *dvp;
KASSERT(MOUNTEDSOFTDEP(ITOVFS(dp)) != 0,
@@ -5205,11 +5205,9 @@
struct inode *dp;
struct inode *ip;
{
- struct vnode *dvp;
KASSERT(MOUNTEDSOFTDEP(ITOVFS(dp)) != 0,
("softdep_setup_rmdir called on non-softdep filesystem"));
- dvp = ITOV(dp);
ACQUIRE_LOCK(ITOUMP(dp));
(void) inodedep_lookup_ip(ip);
(void) inodedep_lookup_ip(dp);
@@ -5225,11 +5223,9 @@
struct inode *dp;
struct inode *ip;
{
- struct vnode *dvp;
KASSERT(MOUNTEDSOFTDEP(ITOVFS(dp)) != 0,
("softdep_setup_unlink called on non-softdep filesystem"));
- dvp = ITOV(dp);
ACQUIRE_LOCK(ITOUMP(dp));
(void) inodedep_lookup_ip(ip);
(void) inodedep_lookup_ip(dp);
@@ -6424,7 +6420,7 @@
struct allocindir *aip; /* allocindir allocated by the above routines */
ufs_lbn_t lbn; /* Logical block number for this block. */
{
- struct fs *fs;
+ struct fs *fs __diagused;
struct indirdep *indirdep;
struct allocindir *oldaip;
struct freefrag *freefrag;
@@ -10626,7 +10622,7 @@
#ifdef INVARIANTS
ufs_lbn_t prevlbn = 0;
#endif
- int deplist;
+ int deplist __diagused;
if (inodedep->id_state & IOSTARTED)
panic("initiate_write_inodeblock_ufs1: already started");
@@ -10798,7 +10794,7 @@
#ifdef INVARIANTS
ufs_lbn_t prevlbn = 0;
#endif
- int deplist;
+ int deplist __diagused;
if (inodedep->id_state & IOSTARTED)
panic("initiate_write_inodeblock_ufs2: already started");
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -347,7 +347,8 @@
struct thread *td;
struct ufsmount *ump = NULL;
struct fs *fs;
- int error, error1, flags;
+ int error, flags;
+ int error1 __diagused;
uint64_t mntorflags, saved_mnt_flag;
accmode_t accmode;
struct nameidata ndp;
@@ -1613,11 +1614,9 @@
{
struct vnode *mvp, *vp;
struct inode *ip;
- struct thread *td;
int allerror, error;
allerror = 0;
- td = curthread;
if ((mp->mnt_flag & MNT_NOATIME) != 0) {
#ifdef QUOTA
qsync(mp);
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1399,7 +1399,6 @@
ffs_open_ea(struct vnode *vp, struct ucred *cred, struct thread *td)
{
struct inode *ip;
- struct ufs2_dinode *dp;
int error;
ip = VTOI(vp);
@@ -1410,7 +1409,6 @@
ffs_unlock_ea(vp);
return (0);
}
- dp = ip->i_din2;
error = ffs_rdextattr(&ip->i_ea_area, vp, td);
if (error) {
ffs_unlock_ea(vp);
@@ -1994,7 +1992,6 @@
struct inode *dp, *ip;
ino_t ip_ino;
u_int64_t ip_gen;
- off_t old_size;
int error, vp_locked;
dvp = ap->a_dvp;
@@ -2031,7 +2028,6 @@
VNASSERT(I_ENDOFF(dp) != 0 && I_ENDOFF(dp) < dp->i_size, dvp,
("IN_ENDOFF set but I_ENDOFF() is not"));
dp->i_flag &= ~IN_ENDOFF;
- old_size = dp->i_size;
error = UFS_TRUNCATE(dvp, (off_t)I_ENDOFF(dp), IO_NORMAL |
(DOINGASYNC(dvp) ? 0 : IO_SYNC), curthread->td_ucred);
if (error != 0 && error != ERELOOKUP) {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Sep 23, 11:38 PM (20 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12604850
Default Alt Text
D32577.id97167.diff (6 KB)
Attached To
Mode
D32577: ufs, msdosfs, tmpfs: remove write-only variables
Attached
Detach File
Event Timeline
Log In to Comment