d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext2: Garbage-collect some unused variables

Browse Source 
Reported by:	clang static analysis
MFC after:	2 weeks
This commit is contained in:
Pedro F. Giffuni 2015-01-19 03:30:45 +00:00
parent 545ddfbe7d
commit 9a53618ab2
7 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/ext2fs/ext2_bmap.c
View File

@ -145,7 +145,6 @@ ext2_bmaparray(struct vnode *vp, daddr_t bn, daddr_t *bnp, int *runp, int *runb)
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 bn, daddr_t *bnp, int *runp, int *runb)
ip = VTOI(vp);
mp = vp->v_mount;
ump = VFSTOEXT2(mp);
devvp = ump->um_devvp;
bsize = EXT2_BLOCK_SIZE(ump->um_e2fs);

2
sys/fs/ext2fs/ext2_extents.c
View File

@ -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)

4
sys/fs/ext2fs/ext2_htree.c
View File

@ -395,7 +395,7 @@ ext2_htree_append_block(struct vnode *vp, char *data,
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, struct ext2fs_direct_2 *entry,
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,

2
sys/fs/ext2fs/ext2_inode.c
View File

@ -115,7 +115,6 @@ ext2_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred,
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;
@ -124,7 +123,6 @@ ext2_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred,
off_t osize;
oip = VTOI(ovp);
bo = &ovp->v_bufobj;
ASSERT_VOP_LOCKED(vp, "ext2_truncate");

1
sys/fs/ext2fs/ext2_lookup.c
View File

@ -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;

2
sys/fs/ext2fs/ext2_vfsops.c
View File

@ -902,7 +902,6 @@ ext2_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
struct ext2mount *ump;
struct buf *bp;
struct vnode *vp;
struct cdev *dev;
struct thread *td;
int i, error;
int used_blocks;
@ -913,7 +912,6 @@ ext2_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
return (error);
ump = VFSTOEXT2(mp);
dev = ump->um_dev;
ip = malloc(sizeof(struct inode), M_EXT2NODE, M_WAITOK | M_ZERO);
/* Allocate a new vnode/inode. */

3
sys/fs/ext2fs/ext2_vnops.c
View File

@ -1223,7 +1223,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;
@ -1329,12 +1328,10 @@ ext2_strategy(struct vop_strategy_args *ap)
{
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) {