Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/fs/udf fix unused variable warnings
details: https://anonhg.NetBSD.org/src/rev/4c1fa3f5a068
branches: trunk
changeset: 790630:4c1fa3f5a068
user: christos <christos%NetBSD.org@localhost>
date: Fri Oct 18 19:56:55 2013 +0000
description:
fix unused variable warnings
diffstat:
sys/fs/udf/udf.h | 4 +-
sys/fs/udf/udf_allocation.c | 47 +++++--------------------------
sys/fs/udf/udf_strat_direct.c | 19 ++++++------
sys/fs/udf/udf_strat_rmw.c | 12 +++----
sys/fs/udf/udf_strat_sequential.c | 16 ++--------
sys/fs/udf/udf_subr.c | 57 ++++++++++----------------------------
sys/fs/udf/udf_vnops.c | 19 ++++--------
7 files changed, 50 insertions(+), 124 deletions(-)
diffs (truncated from 710 to 300 lines):
diff -r 3ee8e36e3f42 -r 4c1fa3f5a068 sys/fs/udf/udf.h
--- a/sys/fs/udf/udf.h Fri Oct 18 19:56:30 2013 +0000
+++ b/sys/fs/udf/udf.h Fri Oct 18 19:56:55 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.45 2012/07/27 22:55:30 drochner Exp $ */
+/* $NetBSD: udf.h,v 1.46 2013/10/18 19:56:55 christos Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -78,7 +78,7 @@
/* initial value of udf_verbose */
#define UDF_DEBUGGING 0
-#ifdef DEBUG
+#ifdef UDF_DEBUG
#define DPRINTF(name, arg) { \
if (udf_verbose & UDF_DEBUG_##name) {\
printf arg;\
diff -r 3ee8e36e3f42 -r 4c1fa3f5a068 sys/fs/udf/udf_allocation.c
--- a/sys/fs/udf/udf_allocation.c Fri Oct 18 19:56:30 2013 +0000
+++ b/sys/fs/udf/udf_allocation.c Fri Oct 18 19:56:55 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.34 2013/08/09 20:13:18 reinoud Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.35 2013/10/18 19:56:55 christos Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.34 2013/08/09 20:13:18 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.35 2013/10/18 19:56:55 christos Exp $");
#endif /* not lint */
@@ -342,23 +342,15 @@
uint64_t *cnt_inflen, uint64_t *cnt_logblksrec) {
struct file_entry *fe;
struct extfile_entry *efe;
- struct icb_tag *icbtag;
uint64_t inflen, logblksrec;
- int dscr_size, lb_size;
-
- lb_size = udf_rw32(udf_node->ump->logical_vol->lb_size);
fe = udf_node->fe;
efe = udf_node->efe;
if (fe) {
- icbtag = &fe->icbtag;
inflen = udf_rw64(fe->inf_len);
- dscr_size = sizeof(struct file_entry) -1;
logblksrec = udf_rw64(fe->logblks_rec);
} else {
- icbtag = &efe->icbtag;
inflen = udf_rw64(efe->inf_len);
- dscr_size = sizeof(struct extfile_entry) -1;
logblksrec = udf_rw64(efe->logblks_rec);
}
*cnt_logblksrec = logblksrec;
@@ -1311,9 +1303,8 @@
uint16_t vpart_num, uint32_t num_lb)
{
struct udf_bitmap *bitmap;
- struct part_desc *pdesc;
struct logvol_int_desc *lvid;
- uint32_t ptov, lb_map, udf_rw32_lbmap;
+ uint32_t lb_map, udf_rw32_lbmap;
uint32_t *freepos, free_lbs;
int phys_part;
int error;
@@ -1327,14 +1318,10 @@
mutex_enter(&ump->allocate_mutex);
- /* get partition backing up this vpart_num */
- pdesc = ump->partitions[ump->vtop[vpart_num]];
-
switch (ump->vtop_tp[vpart_num]) {
case UDF_VTOP_TYPE_PHYS :
case UDF_VTOP_TYPE_SPARABLE :
/* free space to freed or unallocated space bitmap */
- ptov = udf_rw32(pdesc->start_loc);
phys_part = ump->vtop[vpart_num];
/* first try freed space bitmap */
@@ -1653,7 +1640,7 @@
uint64_t *lmapping, struct long_ad *node_ad_cpy, uint16_t *vpart_nump)
{
struct udf_node *udf_node = VTOI(buf->b_vp);
- int lb_size, blks, udf_c_type;
+ int lb_size, udf_c_type;
int vpart_num, num_lb;
int error, s;
@@ -1666,7 +1653,6 @@
lb_size = udf_rw32(ump->logical_vol->lb_size);
num_lb = (buf->b_bcount + lb_size -1) / lb_size;
- blks = lb_size / DEV_BSIZE;
udf_c_type = buf->b_udf_c_type;
KASSERT(lb_size == ump->discinfo.sector_size);
@@ -1774,8 +1760,7 @@
struct file_entry *fe;
struct extfile_entry *efe;
struct alloc_ext_entry *ext;
- uint64_t inflen, objsize;
- uint32_t lb_size, dscr_size, l_ea, l_ad, max_l_ad, crclen;
+ uint32_t lb_size, dscr_size, l_ea, max_l_ad, crclen;
uint8_t *data_pos;
int extnr;
@@ -1784,18 +1769,12 @@
fe = udf_node->fe;
efe = udf_node->efe;
if (fe) {
- inflen = udf_rw64(fe->inf_len);
- objsize = inflen;
dscr_size = sizeof(struct file_entry) -1;
l_ea = udf_rw32(fe->l_ea);
- l_ad = udf_rw32(fe->l_ad);
data_pos = (uint8_t *) fe + dscr_size + l_ea;
} else {
- inflen = udf_rw64(efe->inf_len);
- objsize = udf_rw64(efe->obj_size);
dscr_size = sizeof(struct extfile_entry) -1;
l_ea = udf_rw32(efe->l_ea);
- l_ad = udf_rw32(efe->l_ad);
data_pos = (uint8_t *) efe + dscr_size + l_ea;
}
max_l_ad = lb_size - dscr_size - l_ea;
@@ -1840,13 +1819,10 @@
struct short_ad *short_ad;
struct long_ad *long_ad, l_icb;
uint32_t offset;
- uint32_t lb_size, dscr_size, l_ea, l_ad, flags;
+ uint32_t dscr_size, l_ea, l_ad, flags;
uint8_t *data_pos;
int icbflags, addr_type, adlen, extnr;
- /* determine what descriptor we are in */
- lb_size = udf_rw32(udf_node->ump->logical_vol->lb_size);
-
fe = udf_node->fe;
efe = udf_node->efe;
if (fe) {
@@ -2196,12 +2172,10 @@
uint16_t vpart_num;
int slot, eof;
int num_extents, extnr;
- int lb_size;
if (udf_node->num_extensions == 0)
return;
- lb_size = udf_rw32(udf_node->ump->logical_vol->lb_size);
/* count number of allocation extents in use */
num_extents = 0;
slot = 0;
@@ -2623,7 +2597,6 @@
int
udf_grow_node(struct udf_node *udf_node, uint64_t new_size)
{
- union dscrptr *dscr;
struct vnode *vp = udf_node->vnode;
struct udf_mount *ump = udf_node->ump;
struct file_entry *fe;
@@ -2637,9 +2610,9 @@
uint32_t icbflags, len, flags, max_len;
uint32_t max_l_ad, l_ad, l_ea;
uint16_t my_part, dst_part;
- uint8_t *data_pos, *evacuated_data;
+ uint8_t *evacuated_data;
int addr_type;
- int slot, cpy_slot;
+ int slot;
int eof, error;
DPRINTF(ALLOC, ("udf_grow_node\n"));
@@ -2658,7 +2631,6 @@
fe = udf_node->fe;
efe = udf_node->efe;
if (fe) {
- dscr = (union dscrptr *) fe;
icbtag = &fe->icbtag;
inflen = udf_rw64(fe->inf_len);
objsize = inflen;
@@ -2666,7 +2638,6 @@
l_ea = udf_rw32(fe->l_ea);
l_ad = udf_rw32(fe->l_ad);
} else {
- dscr = (union dscrptr *) efe;
icbtag = &efe->icbtag;
inflen = udf_rw64(efe->inf_len);
objsize = udf_rw64(efe->obj_size);
@@ -2674,7 +2645,6 @@
l_ea = udf_rw32(efe->l_ea);
l_ad = udf_rw32(efe->l_ad);
}
- data_pos = (uint8_t *) dscr + dscr_size + l_ea;
max_l_ad = lb_size - dscr_size - l_ea;
icbflags = udf_rw16(icbtag->flags);
@@ -2769,7 +2739,6 @@
} else {
/* goto the last entry (if any) */
slot = 0;
- cpy_slot = 0;
foffset = 0;
memset(&c_ad, 0, sizeof(struct long_ad));
for (;;) {
diff -r 3ee8e36e3f42 -r 4c1fa3f5a068 sys/fs/udf/udf_strat_direct.c
--- a/sys/fs/udf/udf_strat_direct.c Fri Oct 18 19:56:30 2013 +0000
+++ b/sys/fs/udf/udf_strat_direct.c Fri Oct 18 19:56:55 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_direct.c,v 1.10 2009/05/20 15:30:26 reinoud Exp $ */
+/* $NetBSD: udf_strat_direct.c,v 1.11 2013/10/18 19:56:55 christos Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_direct.c,v 1.10 2009/05/20 15:30:26 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_direct.c,v 1.11 2013/10/18 19:56:55 christos Exp $");
#endif /* not lint */
@@ -246,15 +246,15 @@
struct buf *nestbuf;
struct desc_tag *tag;
struct long_ad *node_ad_cpy;
- uint64_t *lmapping, *pmapping, *lmappos, blknr, run_start;
- uint32_t our_sectornr, sectornr;
- uint32_t lb_size, buf_offset, rbuflen, bpos;
+ uint64_t *lmapping, *pmapping, *lmappos, run_start;
+ uint32_t sectornr;
+ uint32_t buf_offset, rbuflen, bpos;
uint16_t vpart_num;
uint8_t *fidblk;
off_t rblk;
int sector_size = ump->discinfo.sector_size;
+ int len, buf_len, sector, sectors, run_length;
int blks = sector_size / DEV_BSIZE;
- int len, buf_len, sector, sectors, run_length;
int what, class, queue;
KASSERT(ump);
@@ -280,6 +280,9 @@
(ump->discinfo.mmc_cur & MMC_CAP_HW_DEFECTFREE) ||
(ump->vfs_mountp->mnt_flag & MNT_RDONLY));
+#ifndef UDF_DEBUG
+ __USE(blks);
+#endif
if (queue == UDF_SHED_READING) {
DPRINTF(SHEDULE, ("\nudf_issue_buf READ %p : sector %d type %d,"
"b_resid %d, b_bcount %d, b_bufsize %d\n",
@@ -289,10 +292,6 @@
return;
}
- /* (sectorsize == lb_size) for UDF */
- lb_size = udf_rw32(ump->logical_vol->lb_size);
- blknr = buf->b_blkno;
- our_sectornr = blknr / blks;
if (queue == UDF_SHED_WRITING) {
DPRINTF(SHEDULE, ("\nudf_issue_buf WRITE %p : sector %d "
diff -r 3ee8e36e3f42 -r 4c1fa3f5a068 sys/fs/udf/udf_strat_rmw.c
--- a/sys/fs/udf/udf_strat_rmw.c Fri Oct 18 19:56:30 2013 +0000
+++ b/sys/fs/udf/udf_strat_rmw.c Fri Oct 18 19:56:55 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_rmw.c,v 1.22 2009/07/08 19:04:08 reinoud Exp $ */
+/* $NetBSD: udf_strat_rmw.c,v 1.23 2013/10/18 19:56:55 christos Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.22 2009/07/08 19:04:08 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.23 2013/10/18 19:56:55 christos Exp $");
#endif /* not lint */
@@ -372,7 +372,7 @@
uint32_t start_sector, lb_size, blobsize;
uint8_t *eccline_blob;
int line, line_offset;
- int num_busy, ret;
+ int num_busy;
mutex_enter(&priv->discstrat_mutex);
@@ -406,7 +406,7 @@
DPRINTF(ECCLINE, ("\tallocating new eccline\n"));
Home |
Main Index |
Thread Index |
Old Index