svn commit: r278097 - stable/9/sys/fs/ext2fs
Pedro F. Giffuni
pfg at FreeBSD.org
Mon Feb 2 15:53:04 UTC 2015
Author: pfg
Date: Mon Feb 2 15:53:01 2015
New Revision: 278097
URL: https://svnweb.freebsd.org/changeset/base/278097
Log:
MFC r277354, r277365:
ext2: Garbage-collect some unused variables
Reported by: clang static analysis
Modified:
stable/9/sys/fs/ext2fs/ext2_bmap.c
stable/9/sys/fs/ext2fs/ext2_extents.c
stable/9/sys/fs/ext2fs/ext2_htree.c
stable/9/sys/fs/ext2fs/ext2_inode.c
stable/9/sys/fs/ext2fs/ext2_lookup.c
stable/9/sys/fs/ext2fs/ext2_vfsops.c
stable/9/sys/fs/ext2fs/ext2_vnops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/fs/ext2fs/ext2_bmap.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_bmap.c Mon Feb 2 15:52:11 2015 (r278096)
+++ stable/9/sys/fs/ext2fs/ext2_bmap.c Mon Feb 2 15:53:01 2015 (r278097)
@@ -145,7 +145,6 @@ ext2_bmaparray(struct vnode *vp, daddr_t
struct buf *bp;
struct ext2mount *ump;
struct mount *mp;
- struct vnode *devvp;
struct indir a[NIADDR+1], *ap;
daddr_t daddr;
e2fs_lbn_t metalbn;
@@ -156,7 +155,6 @@ ext2_bmaparray(struct vnode *vp, daddr_t
ip = VTOI(vp);
mp = vp->v_mount;
ump = VFSTOEXT2(mp);
- devvp = ump->um_devvp;
bsize = EXT2_BLOCK_SIZE(ump->um_e2fs);
Modified: stable/9/sys/fs/ext2fs/ext2_extents.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_extents.c Mon Feb 2 15:52:11 2015 (r278096)
+++ stable/9/sys/fs/ext2fs/ext2_extents.c Mon Feb 2 15:53:01 2015 (r278097)
@@ -131,13 +131,11 @@ struct ext4_extent_path *
ext4_ext_find_extent(struct m_ext2fs *fs, struct inode *ip,
daddr_t lbn, struct ext4_extent_path *path)
{
- struct vnode *vp;
struct ext4_extent_header *ehp;
uint16_t i;
int error, size;
daddr_t nblk;
- vp = ITOV(ip);
ehp = (struct ext4_extent_header *)(char *)ip->i_db;
if (ehp->eh_magic != EXT4_EXT_MAGIC)
Modified: stable/9/sys/fs/ext2fs/ext2_htree.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_htree.c Mon Feb 2 15:52:11 2015 (r278096)
+++ stable/9/sys/fs/ext2fs/ext2_htree.c Mon Feb 2 15:53:01 2015 (r278097)
@@ -395,7 +395,7 @@ ext2_htree_append_block(struct vnode *vp
int error;
cursize = roundup(dp->i_size, blksize);
- newsize = roundup(dp->i_size, blksize) + blksize;
+ newsize = cursize + blksize;
auio.uio_offset = cursize;
auio.uio_resid = blksize;
@@ -771,7 +771,7 @@ ext2_htree_add_entry(struct vnode *dvp,
dst_node->h_fake_dirent.e2d_reclen = blksize;
cursize = roundup(ip->i_size, blksize);
- dirsize = roundup(ip->i_size, blksize) + blksize;
+ dirsize = cursize + blksize;
blknum = dirsize / blksize - 1;
error = ext2_htree_append_block(dvp, newidxblock,
Modified: stable/9/sys/fs/ext2fs/ext2_inode.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_inode.c Mon Feb 2 15:52:11 2015 (r278096)
+++ stable/9/sys/fs/ext2fs/ext2_inode.c Mon Feb 2 15:53:01 2015 (r278097)
@@ -114,16 +114,20 @@ ext2_truncate(struct vnode *vp, off_t le
struct inode *oip;
int32_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
uint32_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
- struct bufobj *bo;
struct m_ext2fs *fs;
struct buf *bp;
int offset, size, level;
e4fs_daddr_t count, nblocks, blocksreleased = 0;
int error, i, allerror;
off_t osize;
+#ifdef INVARIANTS
+ struct bufobj *bo;
+#endif
oip = VTOI(ovp);
+#ifdef INVARIANTS
bo = &ovp->v_bufobj;
+#endif
ASSERT_VOP_LOCKED(vp, "ext2_truncate");
Modified: stable/9/sys/fs/ext2fs/ext2_lookup.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_lookup.c Mon Feb 2 15:52:11 2015 (r278096)
+++ stable/9/sys/fs/ext2fs/ext2_lookup.c Mon Feb 2 15:53:01 2015 (r278097)
@@ -343,7 +343,6 @@ restart:
* we watch for a place to put the new file in
* case it doesn't already exist.
*/
- ino = 0;
i_diroff = dp->i_diroff;
ss.slotstatus = FOUND;
ss.slotfreespace = ss.slotsize = ss.slotneeded = 0;
Modified: stable/9/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_vfsops.c Mon Feb 2 15:52:11 2015 (r278096)
+++ stable/9/sys/fs/ext2fs/ext2_vfsops.c Mon Feb 2 15:53:01 2015 (r278097)
@@ -903,7 +903,6 @@ ext2_vget(struct mount *mp, ino_t ino, i
struct ext2mount *ump;
struct buf *bp;
struct vnode *vp;
- struct cdev *dev;
struct thread *td;
int i, error;
int used_blocks;
@@ -914,7 +913,6 @@ ext2_vget(struct mount *mp, ino_t ino, i
return (error);
ump = VFSTOEXT2(mp);
- dev = ump->um_dev;
/*
* If this malloc() is performed after the getnewvnode()
Modified: stable/9/sys/fs/ext2fs/ext2_vnops.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_vnops.c Mon Feb 2 15:52:11 2015 (r278096)
+++ stable/9/sys/fs/ext2fs/ext2_vnops.c Mon Feb 2 15:53:01 2015 (r278097)
@@ -1227,7 +1227,6 @@ ext2_rmdir(struct vop_rmdir_args *ap)
* the current directory and thus be
* non-empty.)
*/
- error = 0;
if (ip->i_nlink != 2 || !ext2_dirempty(ip, dp->i_number, cnp->cn_cred)) {
error = ENOTEMPTY;
goto out;
@@ -1333,12 +1332,10 @@ ext2_strategy(struct vop_strategy_args *
{
struct buf *bp = ap->a_bp;
struct vnode *vp = ap->a_vp;
- struct inode *ip;
struct bufobj *bo;
daddr_t blkno;
int error;
- ip = VTOI(vp);
if (vp->v_type == VBLK || vp->v_type == VCHR)
panic("ext2_strategy: spec");
if (bp->b_blkno == bp->b_lblkno) {
More information about the svn-src-all
mailing list