summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/ufs/ffs/ffs_alloc.c8
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c3
-rw-r--r--sys/ufs/ffs/ffs_vnops.c29
3 files changed, 7 insertions, 33 deletions
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index f8c4fab..4a275eb 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1682,7 +1682,7 @@ ffs_blkfree(fs, devvp, bno, size, inum)
struct buf *bp;
ufs1_daddr_t fragno, cgbno;
ufs2_daddr_t cgblkno;
- int i, error, cg, blk, frags, bbase;
+ int i, cg, blk, frags, bbase;
u_int8_t *blksfree;
dev_t dev;
@@ -1719,7 +1719,7 @@ ffs_blkfree(fs, devvp, bno, size, inum)
ffs_fserr(fs, inum, "bad block");
return;
}
- if ((error = bread(devvp, cgblkno, (int)fs->fs_cgsize, NOCRED, &bp))) {
+ if (bread(devvp, cgblkno, (int)fs->fs_cgsize, NOCRED, &bp)) {
brelse(bp);
return;
}
@@ -1944,7 +1944,7 @@ ffs_checkfreefile(fs, devvp, ino)
struct cg *cgp;
struct buf *bp;
ufs2_daddr_t cgbno;
- int error, ret, cg;
+ int ret, cg;
u_int8_t *inosused;
cg = ino_to_cg(fs, ino);
@@ -1957,7 +1957,7 @@ ffs_checkfreefile(fs, devvp, ino)
}
if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg)
return (1);
- if ((error = bread(devvp, cgbno, (int)fs->fs_cgsize, NOCRED, &bp))) {
+ if (bread(devvp, cgbno, (int)fs->fs_cgsize, NOCRED, &bp)) {
brelse(bp);
return (1);
}
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index f92aa2f..ecdd700 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -404,7 +404,6 @@ ffs_reload(mp, cred, td)
void *space;
struct buf *bp;
struct fs *fs, *newfs;
- dev_t dev;
ufs2_daddr_t sblockloc;
int i, blks, size, error;
int32_t *lp;
@@ -421,8 +420,6 @@ ffs_reload(mp, cred, td)
if (error)
panic("ffs_reload: dirty1");
- dev = devvp->v_rdev;
-
/*
* Only VMIO the backing device if the backing device is a real
* block device.
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 910c0e4..a0fd9f0 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -338,7 +338,6 @@ ffs_read(ap)
off_t bytesinfile;
long size, xfersize, blkoffset;
int error, orig_resid;
- mode_t mode;
int seqcount;
int ioflag;
vm_object_t object;
@@ -366,7 +365,6 @@ ffs_read(ap)
seqcount = ap->a_ioflag >> 16;
ip = VTOI(vp);
- mode = ip->i_mode;
#ifdef DIAGNOSTIC
if (uio->uio_rw != UIO_READ)
@@ -794,7 +792,7 @@ ffs_getpages(ap)
int i, size, bsize;
struct vnode *dp, *vp;
vm_object_t obj;
- vm_pindex_t pindex, firstindex;
+ vm_pindex_t pindex;
vm_page_t mreq;
int bbackwards, bforwards;
int pbackwards, pforwards;
@@ -809,7 +807,6 @@ ffs_getpages(ap)
pcount = round_page(ap->a_count) / PAGE_SIZE;
mreq = ap->a_m[ap->a_reqpage];
- firstindex = ap->a_m[0]->pindex;
/*
* if ANY DEV_BSIZE blocks are valid on a large filesystem block,
@@ -940,14 +937,12 @@ ffs_extread(struct vnode *vp, struct uio *uio, int ioflag)
off_t bytesinfile;
long size, xfersize, blkoffset;
int error, orig_resid;
- mode_t mode;
GIANT_REQUIRED;
ip = VTOI(vp);
fs = ip->i_fs;
dp = ip->i_din2;
- mode = ip->i_mode;
#ifdef DIAGNOSTIC
if (uio->uio_rw != UIO_READ || fs->fs_magic != FS_UFS2_MAGIC)
@@ -1272,7 +1267,6 @@ static int
ffs_rdextattr(u_char **p, struct vnode *vp, struct thread *td, int extra)
{
struct inode *ip;
- struct fs *fs;
struct ufs2_dinode *dp;
struct uio luio;
struct iovec liovec;
@@ -1280,7 +1274,6 @@ ffs_rdextattr(u_char **p, struct vnode *vp, struct thread *td, int extra)
u_char *eae;
ip = VTOI(vp);
- fs = ip->i_fs;
dp = ip->i_din2;
easize = dp->di_extsize;
@@ -1309,12 +1302,10 @@ static int
ffs_open_ea(struct vnode *vp, struct ucred *cred, struct thread *td)
{
struct inode *ip;
- struct fs *fs;
struct ufs2_dinode *dp;
int error;
ip = VTOI(vp);
- fs = ip->i_fs;
if (ip->i_ea_area != NULL)
return (EBUSY);
@@ -1334,14 +1325,12 @@ static int
ffs_close_ea(struct vnode *vp, int commit, struct ucred *cred, struct thread *td)
{
struct inode *ip;
- struct fs *fs;
struct uio luio;
struct iovec liovec;
int error;
struct ufs2_dinode *dp;
ip = VTOI(vp);
- fs = ip->i_fs;
if (ip->i_ea_area == NULL)
return (EINVAL);
dp = ip->i_din2;
@@ -1471,7 +1460,6 @@ vop_getextattr {
struct inode *ip;
struct fs *fs;
u_char *eae, *p, *pe, *pn;
- struct ufs2_dinode *dp;
unsigned easize;
uint32_t ul;
int error, ealen, stand_alone;
@@ -1495,7 +1483,6 @@ vop_getextattr {
} else {
stand_alone = 0;
}
- dp = ip->i_din2;
eae = ip->i_ea_area;
easize = ip->i_ea_len;
if (strlen(ap->a_name) > 0) {
@@ -1556,10 +1543,8 @@ vop_setextattr {
struct inode *ip;
struct fs *fs;
uint32_t ealength, ul;
- int ealen, olen, eacont, eapad1, eapad2, error, i, easize;
+ int ealen, olen, eapad1, eapad2, error, i, easize;
u_char *eae, *p;
- struct ufs2_dinode *dp;
- struct ucred *cred;
int stand_alone;
ip = VTOI(ap->a_vp);
@@ -1576,13 +1561,6 @@ vop_setextattr {
return (error);
}
- if (ap->a_cred != NOCRED)
- cred = ap->a_cred;
- else
- cred = ap->a_vp->v_mount->mnt_cred;
-
- dp = ip->i_din2;
-
if (ip->i_ea_area == NULL) {
error = ffs_open_ea(ap->a_vp, ap->a_cred, ap->a_td);
if (error)
@@ -1595,14 +1573,13 @@ vop_setextattr {
/* Calculate the length of the EA entry */
if (ap->a_uio == NULL) {
/* delete */
- ealength = eapad1 = ealen = eapad2 = eacont = 0;
+ ealength = eapad1 = ealen = eapad2 = 0;
} else {
ealen = ap->a_uio->uio_resid;
ealength = sizeof(uint32_t) + 3 + strlen(ap->a_name);
eapad1 = 8 - (ealength % 8);
if (eapad1 == 8)
eapad1 = 0;
- eacont = ealength + eapad1;
eapad2 = 8 - (ealen % 8);
if (eapad2 == 8)
eapad2 = 0;
OpenPOWER on IntegriCloud