Page MenuHomeFreeBSD
Files F111265159

D32577.diff
No OneTemporary
Actions

D32577.diff
View Options

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

Mime Type
text/plain
Expires
Sun, Mar 2, 3:04 PM (19 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16927730
Default Alt Text
D32577.diff (4 KB)

Event Timeline