Skip to content

Commit ecb697c

Browse files
Christoph HellwigAlex Elder
authored andcommitted
xfs: fix variable set but not used warnings
GCC 4.6 now warnings about variables set but not used. Fix the trivially fixable warnings of this sort. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
1 parent da8a1a4 commit ecb697c

File tree

5 files changed

+0
-18
lines changed

5 files changed

+0
-18
lines changed

fs/xfs/linux-2.6/xfs_buf.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ xfs_buf_allocate_memory(
293293
size_t nbytes, offset;
294294
gfp_t gfp_mask = xb_to_gfp(flags);
295295
unsigned short page_count, i;
296-
pgoff_t first;
297296
xfs_off_t end;
298297
int error;
299298

@@ -333,7 +332,6 @@ xfs_buf_allocate_memory(
333332
return error;
334333

335334
offset = bp->b_offset;
336-
first = bp->b_file_offset >> PAGE_SHIFT;
337335
bp->b_flags |= _XBF_PAGES;
338336

339337
for (i = 0; i < bp->b_page_count; i++) {

fs/xfs/quota/xfs_qm.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -461,12 +461,10 @@ xfs_qm_dqflush_all(
461461
struct xfs_quotainfo *q = mp->m_quotainfo;
462462
int recl;
463463
struct xfs_dquot *dqp;
464-
int niters;
465464
int error;
466465

467466
if (!q)
468467
return 0;
469-
niters = 0;
470468
again:
471469
mutex_lock(&q->qi_dqlist_lock);
472470
list_for_each_entry(dqp, &q->qi_dqlist, q_mplist) {
@@ -1314,14 +1312,9 @@ xfs_qm_dqiter_bufs(
13141312
{
13151313
xfs_buf_t *bp;
13161314
int error;
1317-
int notcommitted;
1318-
int incr;
13191315
int type;
13201316

13211317
ASSERT(blkcnt > 0);
1322-
notcommitted = 0;
1323-
incr = (blkcnt > XFS_QM_MAX_DQCLUSTER_LOGSZ) ?
1324-
XFS_QM_MAX_DQCLUSTER_LOGSZ : blkcnt;
13251318
type = flags & XFS_QMOPT_UQUOTA ? XFS_DQ_USER :
13261319
(flags & XFS_QMOPT_PQUOTA ? XFS_DQ_PROJ : XFS_DQ_GROUP);
13271320
error = 0;

fs/xfs/quota/xfs_qm.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ extern kmem_zone_t *qm_dqtrxzone;
6565
* block in the dquot/xqm code.
6666
*/
6767
#define XFS_DQUOT_CLUSTER_SIZE_FSB (xfs_filblks_t)1
68-
/*
69-
* When doing a quotacheck, we log dquot clusters of this many FSBs at most
70-
* in a single transaction. We don't want to ask for too huge a log reservation.
71-
*/
72-
#define XFS_QM_MAX_DQCLUSTER_LOGSZ 3
7368

7469
typedef xfs_dqhash_t xfs_dqlist_t;
7570

fs/xfs/quota/xfs_qm_syscalls.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,14 +313,12 @@ xfs_qm_scall_quotaon(
313313
{
314314
int error;
315315
uint qf;
316-
uint accflags;
317316
__int64_t sbflags;
318317

319318
flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
320319
/*
321320
* Switching on quota accounting must be done at mount time.
322321
*/
323-
accflags = flags & XFS_ALL_QUOTA_ACCT;
324322
flags &= ~(XFS_ALL_QUOTA_ACCT);
325323

326324
sbflags = 0;

fs/xfs/xfs_itable.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ xfs_bulkstat(
204204
xfs_agi_t *agi; /* agi header data */
205205
xfs_agino_t agino; /* inode # in allocation group */
206206
xfs_agnumber_t agno; /* allocation group number */
207-
xfs_daddr_t bno; /* inode cluster start daddr */
208207
int chunkidx; /* current index into inode chunk */
209208
int clustidx; /* current index into inode cluster */
210209
xfs_btree_cur_t *cur; /* btree cursor for ialloc btree */
@@ -463,7 +462,6 @@ xfs_bulkstat(
463462
mp->m_sb.sb_inopblog);
464463
}
465464
ino = XFS_AGINO_TO_INO(mp, agno, agino);
466-
bno = XFS_AGB_TO_DADDR(mp, agno, agbno);
467465
/*
468466
* Skip if this inode is free.
469467
*/

0 commit comments

Comments
 (0)