Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecb697c1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent da8a1a4a

fs/xfs/linux-2.6/xfs_buf.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -293,7 +293,6 @@ xfs_buf_allocate_memory( 
	size_t			nbytes, offset;

	size_t			nbytes, offset;

	gfp_t			gfp_mask = xb_to_gfp(flags);

	gfp_t			gfp_mask = xb_to_gfp(flags);

	unsigned short		page_count, i;

	unsigned short		page_count, i;

	pgoff_t			first;

	xfs_off_t		end;

	xfs_off_t		end;

	int			error;

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

		return error;





	offset = bp->b_offset;

	offset = bp->b_offset;

	first = bp->b_file_offset >> PAGE_SHIFT;

	bp->b_flags |= _XBF_PAGES;

	bp->b_flags |= _XBF_PAGES;





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

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

fs/xfs/quota/xfs_qm.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -461,12 +461,10 @@ xfs_qm_dqflush_all( 
	struct xfs_quotainfo	*q = mp->m_quotainfo;

	struct xfs_quotainfo	*q = mp->m_quotainfo;

	int			recl;

	int			recl;

	struct xfs_dquot	*dqp;

	struct xfs_dquot	*dqp;

	int			niters;

	int			error;

	int			error;





	if (!q)

	if (!q)

		return 0;

		return 0;

	niters = 0;

again:

again:

	mutex_lock(&q->qi_dqlist_lock);

	mutex_lock(&q->qi_dqlist_lock);

	list_for_each_entry(dqp, &q->qi_dqlist, q_mplist) {

	list_for_each_entry(dqp, &q->qi_dqlist, q_mplist) {
@@ -1314,14 +1312,9 @@ xfs_qm_dqiter_bufs( 
{

{

	xfs_buf_t	*bp;

	xfs_buf_t	*bp;

	int		error;

	int		error;

	int		notcommitted;

	int		incr;

	int		type;

	int		type;





	ASSERT(blkcnt > 0);

	ASSERT(blkcnt > 0);

	notcommitted = 0;

	incr = (blkcnt > XFS_QM_MAX_DQCLUSTER_LOGSZ) ?

		XFS_QM_MAX_DQCLUSTER_LOGSZ : blkcnt;

	type = flags & XFS_QMOPT_UQUOTA ? XFS_DQ_USER :

	type = flags & XFS_QMOPT_UQUOTA ? XFS_DQ_USER :

		(flags & XFS_QMOPT_PQUOTA ? XFS_DQ_PROJ : XFS_DQ_GROUP);

		(flags & XFS_QMOPT_PQUOTA ? XFS_DQ_PROJ : XFS_DQ_GROUP);

	error = 0;

	error = 0;

fs/xfs/quota/xfs_qm.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -65,11 +65,6 @@ extern kmem_zone_t *qm_dqtrxzone; 
 * block in the dquot/xqm code.

 * block in the dquot/xqm code.

 */

 */

#define XFS_DQUOT_CLUSTER_SIZE_FSB	(xfs_filblks_t)1

#define XFS_DQUOT_CLUSTER_SIZE_FSB	(xfs_filblks_t)1

/*

 * When doing a quotacheck, we log dquot clusters of this many FSBs at most

 * in a single transaction. We don't want to ask for too huge a log reservation.

 */

#define XFS_QM_MAX_DQCLUSTER_LOGSZ	3





typedef xfs_dqhash_t	xfs_dqlist_t;

typedef xfs_dqhash_t	xfs_dqlist_t;

fs/xfs/quota/xfs_qm_syscalls.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -313,14 +313,12 @@ xfs_qm_scall_quotaon( 
{

{

	int		error;

	int		error;

	uint		qf;

	uint		qf;

	uint		accflags;

	__int64_t	sbflags;

	__int64_t	sbflags;





	flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);

	flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);

	/*

	/*

	 * Switching on quota accounting must be done at mount time.

	 * Switching on quota accounting must be done at mount time.

	 */

	 */

	accflags = flags & XFS_ALL_QUOTA_ACCT;

	flags &= ~(XFS_ALL_QUOTA_ACCT);

	flags &= ~(XFS_ALL_QUOTA_ACCT);





	sbflags = 0;

	sbflags = 0;

fs/xfs/xfs_itable.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -204,7 +204,6 @@ xfs_bulkstat( 
	xfs_agi_t		*agi;	/* agi header data */

	xfs_agi_t		*agi;	/* agi header data */

	xfs_agino_t		agino;	/* inode # in allocation group */

	xfs_agino_t		agino;	/* inode # in allocation group */

	xfs_agnumber_t		agno;	/* allocation group number */

	xfs_agnumber_t		agno;	/* allocation group number */

	xfs_daddr_t		bno;	/* inode cluster start daddr */

	int			chunkidx; /* current index into inode chunk */

	int			chunkidx; /* current index into inode chunk */

	int			clustidx; /* current index into inode cluster */

	int			clustidx; /* current index into inode cluster */

	xfs_btree_cur_t		*cur;	/* btree cursor for ialloc btree */

	xfs_btree_cur_t		*cur;	/* btree cursor for ialloc btree */
@@ -463,7 +462,6 @@ xfs_bulkstat( 
						 mp->m_sb.sb_inopblog);

						 mp->m_sb.sb_inopblog);

				}

				}

				ino = XFS_AGINO_TO_INO(mp, agno, agino);

				ino = XFS_AGINO_TO_INO(mp, agno, agino);

				bno = XFS_AGB_TO_DADDR(mp, agno, agbno);

				/*

				/*

				 * Skip if this inode is free.

				 * Skip if this inode is free.

				 */

				 */