korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 04:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

xfs: fix gcc 4.6 set but not read and unused statement warnings

Browse Source 
[hch: dropped a few hunks that need structural changes instead]

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig 2010-07-20 17:54:45 +10:00 committed by Alex Elder
parent 0f1a932f5d
commit 73523a2ecf
7 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/xfs/xfs_alloc.c
View File

@ -683,8 +683,6 @@ xfs_alloc_ag_vextent_near(
xfs_agblock_t ltbno; /* start bno of left side entry */ xfs_agblock_t ltbno; /* start bno of left side entry */
xfs_agblock_t ltbnoa; /* aligned ... */ xfs_agblock_t ltbnoa; /* aligned ... */
xfs_extlen_t ltdiff; /* difference to left side entry */ xfs_extlen_t ltdiff; /* difference to left side entry */
/*REFERENCED*/
xfs_agblock_t ltend; /* end bno of left side entry */
xfs_extlen_t ltlen; /* length of left side entry */ xfs_extlen_t ltlen; /* length of left side entry */
xfs_extlen_t ltlena; /* aligned ... */ xfs_extlen_t ltlena; /* aligned ... */
xfs_agblock_t ltnew; /* useful start bno of left side */ xfs_agblock_t ltnew; /* useful start bno of left side */
@ -809,8 +807,7 @@ xfs_alloc_ag_vextent_near(
if ((error = xfs_alloc_get_rec(cnt_cur, &ltbno, &ltlen, &i))) if ((error = xfs_alloc_get_rec(cnt_cur, &ltbno, &ltlen, &i)))
goto error0; goto error0;
XFS_WANT_CORRUPTED_GOTO(i == 1, error0); XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
ltend = ltbno + ltlen; ASSERT(ltbno + ltlen <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
ASSERT(ltend <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
args->len = blen; args->len = blen;
if (!xfs_alloc_fix_minleft(args)) { if (!xfs_alloc_fix_minleft(args)) {
xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR); xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
@ -823,7 +820,7 @@ xfs_alloc_ag_vextent_near(
*/ */
args->agbno = bnew; args->agbno = bnew;
ASSERT(bnew >= ltbno); ASSERT(bnew >= ltbno);
ASSERT(bnew + blen <= ltend); ASSERT(bnew + blen <= ltbno + ltlen);
/* /*
* Set up a cursor for the by-bno tree. * Set up a cursor for the by-bno tree.
*/ */
@ -1152,7 +1149,6 @@ xfs_alloc_ag_vextent_near(
/* /*
* Fix up the length and compute the useful address. * Fix up the length and compute the useful address.
*/ */
ltend = ltbno + ltlen;
args->len = XFS_EXTLEN_MIN(ltlena, args->maxlen); args->len = XFS_EXTLEN_MIN(ltlena, args->maxlen);
xfs_alloc_fix_len(args); xfs_alloc_fix_len(args);
if (!xfs_alloc_fix_minleft(args)) { if (!xfs_alloc_fix_minleft(args)) {
@ -1165,7 +1161,7 @@ xfs_alloc_ag_vextent_near(
(void)xfs_alloc_compute_diff(args->agbno, rlen, args->alignment, ltbno, (void)xfs_alloc_compute_diff(args->agbno, rlen, args->alignment, ltbno,
ltlen, &ltnew); ltlen, &ltnew);
ASSERT(ltnew >= ltbno); ASSERT(ltnew >= ltbno);
ASSERT(ltnew + rlen <= ltend); ASSERT(ltnew + rlen <= ltbno + ltlen);
ASSERT(ltnew + rlen <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length)); ASSERT(ltnew + rlen <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
args->agbno = ltnew; args->agbno = ltnew;
if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur_lt, ltbno, ltlen, if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur_lt, ltbno, ltlen,

6
fs/xfs/xfs_da_btree.c
View File

@ -576,16 +576,14 @@ xfs_da_node_add(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk,
xfs_da_intnode_t *node; xfs_da_intnode_t *node;
xfs_da_node_entry_t *btree; xfs_da_node_entry_t *btree;
int tmp; int tmp;
xfs_mount_t *mp;
node = oldblk->bp->data; node = oldblk->bp->data;
mp = state->mp;
ASSERT(be16_to_cpu(node->hdr.info.magic) == XFS_DA_NODE_MAGIC); ASSERT(be16_to_cpu(node->hdr.info.magic) == XFS_DA_NODE_MAGIC);
ASSERT((oldblk->index >= 0) && (oldblk->index <= be16_to_cpu(node->hdr.count))); ASSERT((oldblk->index >= 0) && (oldblk->index <= be16_to_cpu(node->hdr.count)));
ASSERT(newblk->blkno != 0); ASSERT(newblk->blkno != 0);
if (state->args->whichfork == XFS_DATA_FORK) if (state->args->whichfork == XFS_DATA_FORK)
ASSERT(newblk->blkno >= mp->m_dirleafblk && ASSERT(newblk->blkno >= state->mp->m_dirleafblk &&
newblk->blkno < mp->m_dirfreeblk); newblk->blkno < state->mp->m_dirfreeblk);
/* /*
* We may need to make some room before we insert the new node. * We may need to make some room before we insert the new node.

6
fs/xfs/xfs_dir2_block.c
View File

@ -1071,10 +1071,10 @@ xfs_dir2_sf_to_block(
*/ */
buf_len = dp->i_df.if_bytes; buf_len = dp->i_df.if_bytes;
buf = kmem_alloc(dp->i_df.if_bytes, KM_SLEEP); buf = kmem_alloc(buf_len, KM_SLEEP);
memcpy(buf, sfp, dp->i_df.if_bytes); memcpy(buf, sfp, buf_len);
xfs_idata_realloc(dp, -dp->i_df.if_bytes, XFS_DATA_FORK); xfs_idata_realloc(dp, -buf_len, XFS_DATA_FORK);
dp->i_d.di_size = 0; dp->i_d.di_size = 0;
xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE); xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE);
/* /*

3
fs/xfs/xfs_iget.c
View File

@ -261,7 +261,6 @@ xfs_iget_cache_miss(
{ {
struct xfs_inode *ip; struct xfs_inode *ip;
int error; int error;
unsigned long first_index, mask;
xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ino); xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ino);
ip = xfs_inode_alloc(mp, ino); ip = xfs_inode_alloc(mp, ino);
@ -298,8 +297,6 @@ xfs_iget_cache_miss(
BUG(); BUG();
} }
mask = ~(((XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog)) - 1);
first_index = agino & mask;
write_lock(&pag->pag_ici_lock); write_lock(&pag->pag_ici_lock);
/* insert the new inode */ /* insert the new inode */

4
fs/xfs/xfs_inode.c
View File

@ -918,7 +918,6 @@ xfs_iread_extents(
int error; int error;
xfs_ifork_t *ifp; xfs_ifork_t *ifp;
xfs_extnum_t nextents; xfs_extnum_t nextents;
size_t size;
if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) { if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) {
XFS_ERROR_REPORT("xfs_iread_extents", XFS_ERRLEVEL_LOW, XFS_ERROR_REPORT("xfs_iread_extents", XFS_ERRLEVEL_LOW,
@ -926,7 +925,6 @@ xfs_iread_extents(
return XFS_ERROR(EFSCORRUPTED); return XFS_ERROR(EFSCORRUPTED);
} }
nextents = XFS_IFORK_NEXTENTS(ip, whichfork); nextents = XFS_IFORK_NEXTENTS(ip, whichfork);
size = nextents * sizeof(xfs_bmbt_rec_t);
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
/* /*
@ -3503,13 +3501,11 @@ xfs_iext_remove_indirect(
xfs_extnum_t ext_diff; /* extents to remove in current list */ xfs_extnum_t ext_diff; /* extents to remove in current list */
xfs_extnum_t nex1; /* number of extents before idx */ xfs_extnum_t nex1; /* number of extents before idx */
xfs_extnum_t nex2; /* extents after idx + count */ xfs_extnum_t nex2; /* extents after idx + count */
int nlists; /* entries in indirection array */
int page_idx = idx; /* index in target extent list */ int page_idx = idx; /* index in target extent list */
ASSERT(ifp->if_flags & XFS_IFEXTIREC); ASSERT(ifp->if_flags & XFS_IFEXTIREC);
erp = xfs_iext_idx_to_irec(ifp, &page_idx, &erp_idx, 0); erp = xfs_iext_idx_to_irec(ifp, &page_idx, &erp_idx, 0);
ASSERT(erp != NULL); ASSERT(erp != NULL);
nlists = ifp->if_real_bytes / XFS_IEXT_BUFSZ;
nex1 = page_idx; nex1 = page_idx;
ext_cnt = count; ext_cnt = count;
while (ext_cnt) { while (ext_cnt) {

18
fs/xfs/xfs_inode_item.c
View File

@ -214,7 +214,6 @@ xfs_inode_item_format(
uint nvecs; uint nvecs;
size_t data_bytes; size_t data_bytes;
xfs_bmbt_rec_t *ext_buffer; xfs_bmbt_rec_t *ext_buffer;
int nrecs;
xfs_mount_t *mp; xfs_mount_t *mp;
vecp->i_addr = &iip->ili_format; vecp->i_addr = &iip->ili_format;
@ -314,9 +313,8 @@ xfs_inode_item_format(
ASSERT(ip->i_df.if_u1.if_extents != NULL); ASSERT(ip->i_df.if_u1.if_extents != NULL);
ASSERT(ip->i_d.di_nextents > 0); ASSERT(ip->i_d.di_nextents > 0);
ASSERT(iip->ili_extents_buf == NULL); ASSERT(iip->ili_extents_buf == NULL);
nrecs = ip->i_df.if_bytes / ASSERT((ip->i_df.if_bytes /
(uint)sizeof(xfs_bmbt_rec_t); (uint)sizeof(xfs_bmbt_rec_t)) > 0);
ASSERT(nrecs > 0);
#ifdef XFS_NATIVE_HOST #ifdef XFS_NATIVE_HOST
if (nrecs == ip->i_d.di_nextents) { if (nrecs == ip->i_d.di_nextents) {
/* /*
@ -439,15 +437,15 @@ xfs_inode_item_format(
ASSERT(!(iip->ili_format.ilf_fields & ASSERT(!(iip->ili_format.ilf_fields &
(XFS_ILOG_ADATA | XFS_ILOG_ABROOT))); (XFS_ILOG_ADATA | XFS_ILOG_ABROOT)));
if (iip->ili_format.ilf_fields & XFS_ILOG_AEXT) { if (iip->ili_format.ilf_fields & XFS_ILOG_AEXT) {
#ifdef DEBUG
int nrecs = ip->i_afp->if_bytes /
(uint)sizeof(xfs_bmbt_rec_t);
ASSERT(nrecs > 0);
ASSERT(nrecs == ip->i_d.di_anextents);
ASSERT(ip->i_afp->if_bytes > 0); ASSERT(ip->i_afp->if_bytes > 0);
ASSERT(ip->i_afp->if_u1.if_extents != NULL); ASSERT(ip->i_afp->if_u1.if_extents != NULL);
ASSERT(ip->i_d.di_anextents > 0); ASSERT(ip->i_d.di_anextents > 0);
#ifdef DEBUG
nrecs = ip->i_afp->if_bytes /
(uint)sizeof(xfs_bmbt_rec_t);
#endif #endif
ASSERT(nrecs > 0);
ASSERT(nrecs == ip->i_d.di_anextents);
#ifdef XFS_NATIVE_HOST #ifdef XFS_NATIVE_HOST
/* /*
* There are not delayed allocation extents * There are not delayed allocation extents
@ -889,10 +887,8 @@ xfs_iflush_abort(
xfs_inode_t *ip) xfs_inode_t *ip)
{ {
xfs_inode_log_item_t *iip = ip->i_itemp; xfs_inode_log_item_t *iip = ip->i_itemp;
xfs_mount_t *mp;
iip = ip->i_itemp; iip = ip->i_itemp;
mp = ip->i_mount;
if (iip) { if (iip) {
struct xfs_ail *ailp = iip->ili_item.li_ailp; struct xfs_ail *ailp = iip->ili_item.li_ailp;
if (iip->ili_item.li_flags & XFS_LI_IN_AIL) { if (iip->ili_item.li_flags & XFS_LI_IN_AIL) {

2
fs/xfs/xfs_log.c
View File

@ -1042,7 +1042,6 @@ xlog_alloc_log(xfs_mount_t *mp,
xlog_in_core_t *iclog, *prev_iclog=NULL; xlog_in_core_t *iclog, *prev_iclog=NULL;
xfs_buf_t *bp; xfs_buf_t *bp;
int i; int i;
int iclogsize;
int error = ENOMEM; int error = ENOMEM;
uint log2_size = 0; uint log2_size = 0;
@ -1122,7 +1121,6 @@ xlog_alloc_log(xfs_mount_t *mp,
* with different amounts of memory. See the definition of * with different amounts of memory. See the definition of
* xlog_in_core_t in xfs_log_priv.h for details. * xlog_in_core_t in xfs_log_priv.h for details.
*/ */
iclogsize = log->l_iclog_size;
ASSERT(log->l_iclog_size >= 4096); ASSERT(log->l_iclog_size >= 4096);
for (i=0; i < log->l_iclog_bufs; i++) { for (i=0; i < log->l_iclog_bufs; i++) {
*iclogp = kmem_zalloc(sizeof(xlog_in_core_t), KM_MAYFAIL); *iclogp = kmem_zalloc(sizeof(xlog_in_core_t), KM_MAYFAIL);