public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] xfs: fix non-debug build warnings
@ 2015-08-23 22:58 Dave Chinner
  2015-08-24 12:41 ` Brian Foster
  0 siblings, 1 reply; 2+ messages in thread
From: Dave Chinner @ 2015-08-23 22:58 UTC (permalink / raw)
  To: xfs

From: Dave Chinner <dchinner@redhat.com>

There seem to be a couple of new set-but-unused build warnings
that gcc 4.9.3 is now warning about. These are not regressions, just
hte compiler being more picky.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/xfs_buf.c      |  4 +---
 fs/xfs/xfs_buf_item.c | 20 +++++++++++++-------
 fs/xfs/xfs_buf_item.h |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index d7dbd81..c46166b 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -438,7 +438,6 @@ _xfs_buf_find(
 	xfs_buf_flags_t		flags,
 	xfs_buf_t		*new_bp)
 {
-	size_t			numbytes;
 	struct xfs_perag	*pag;
 	struct rb_node		**rbp;
 	struct rb_node		*parent;
@@ -450,10 +449,9 @@ _xfs_buf_find(
 
 	for (i = 0; i < nmaps; i++)
 		numblks += map[i].bm_len;
-	numbytes = BBTOB(numblks);
 
 	/* Check for IOs smaller than the sector size / not sector aligned */
-	ASSERT(!(numbytes < btp->bt_meta_sectorsize));
+	ASSERT(!(BBTOB(numblks) < btp->bt_meta_sectorsize));
 	ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_meta_sectormask));
 
 	/*
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 919057e..7e986da 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -746,13 +746,13 @@ xfs_buf_item_free_format(
  * buffer (see xfs_buf_attach_iodone() below), then put the
  * buf log item at the front.
  */
-void
+int
 xfs_buf_item_init(
-	xfs_buf_t	*bp,
-	xfs_mount_t	*mp)
+	struct xfs_buf	*bp,
+	struct xfs_mount *mp)
 {
-	xfs_log_item_t		*lip = bp->b_fspriv;
-	xfs_buf_log_item_t	*bip;
+	struct xfs_log_item	*lip = bp->b_fspriv;
+	struct xfs_buf_log_item	*bip;
 	int			chunks;
 	int			map_size;
 	int			error;
@@ -766,12 +766,11 @@ xfs_buf_item_init(
 	 */
 	ASSERT(bp->b_target->bt_mount == mp);
 	if (lip != NULL && lip->li_type == XFS_LI_BUF)
-		return;
+		return 0;
 
 	bip = kmem_zone_zalloc(xfs_buf_item_zone, KM_SLEEP);
 	xfs_log_item_init(mp, &bip->bli_item, XFS_LI_BUF, &xfs_buf_item_ops);
 	bip->bli_buf = bp;
-	xfs_buf_hold(bp);
 
 	/*
 	 * chunks is the number of XFS_BLF_CHUNK size pieces the buffer
@@ -784,6 +783,11 @@ xfs_buf_item_init(
 	 */
 	error = xfs_buf_item_get_format(bip, bp->b_map_count);
 	ASSERT(error == 0);
+	if (error) {	/* to stop gcc throwing set-but-unused warnings */
+		kmem_zone_free(xfs_buf_item_zone, bip);
+		return error;
+	}
+
 
 	for (i = 0; i < bip->bli_format_count; i++) {
 		chunks = DIV_ROUND_UP(BBTOB(bp->b_maps[i].bm_len),
@@ -803,6 +807,8 @@ xfs_buf_item_init(
 	if (bp->b_fspriv)
 		bip->bli_item.li_bio_list = bp->b_fspriv;
 	bp->b_fspriv = bip;
+	xfs_buf_hold(bp);
+	return 0;
 }
 
 
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
index 3f3455a..f7eba99 100644
--- a/fs/xfs/xfs_buf_item.h
+++ b/fs/xfs/xfs_buf_item.h
@@ -61,7 +61,7 @@ typedef struct xfs_buf_log_item {
 	struct xfs_buf_log_format __bli_format;	/* embedded in-log header */
 } xfs_buf_log_item_t;
 
-void	xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *);
+int	xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *);
 void	xfs_buf_item_relse(struct xfs_buf *);
 void	xfs_buf_item_log(xfs_buf_log_item_t *, uint, uint);
 uint	xfs_buf_item_dirty(xfs_buf_log_item_t *);
-- 
2.5.0

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] xfs: fix non-debug build warnings
  2015-08-23 22:58 [PATCH] xfs: fix non-debug build warnings Dave Chinner
@ 2015-08-24 12:41 ` Brian Foster
  0 siblings, 0 replies; 2+ messages in thread
From: Brian Foster @ 2015-08-24 12:41 UTC (permalink / raw)
  To: Dave Chinner; +Cc: xfs

On Mon, Aug 24, 2015 at 08:58:41AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> There seem to be a couple of new set-but-unused build warnings
> that gcc 4.9.3 is now warning about. These are not regressions, just
> hte compiler being more picky.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  fs/xfs/xfs_buf.c      |  4 +---
>  fs/xfs/xfs_buf_item.c | 20 +++++++++++++-------
>  fs/xfs/xfs_buf_item.h |  2 +-
>  3 files changed, 15 insertions(+), 11 deletions(-)
> 
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index d7dbd81..c46166b 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -438,7 +438,6 @@ _xfs_buf_find(
>  	xfs_buf_flags_t		flags,
>  	xfs_buf_t		*new_bp)
>  {
> -	size_t			numbytes;
>  	struct xfs_perag	*pag;
>  	struct rb_node		**rbp;
>  	struct rb_node		*parent;
> @@ -450,10 +449,9 @@ _xfs_buf_find(
>  
>  	for (i = 0; i < nmaps; i++)
>  		numblks += map[i].bm_len;
> -	numbytes = BBTOB(numblks);
>  
>  	/* Check for IOs smaller than the sector size / not sector aligned */
> -	ASSERT(!(numbytes < btp->bt_meta_sectorsize));
> +	ASSERT(!(BBTOB(numblks) < btp->bt_meta_sectorsize));
>  	ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_meta_sectormask));
>  
>  	/*
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 919057e..7e986da 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -746,13 +746,13 @@ xfs_buf_item_free_format(
>   * buffer (see xfs_buf_attach_iodone() below), then put the
>   * buf log item at the front.
>   */
> -void
> +int
>  xfs_buf_item_init(
> -	xfs_buf_t	*bp,
> -	xfs_mount_t	*mp)
> +	struct xfs_buf	*bp,
> +	struct xfs_mount *mp)
>  {
> -	xfs_log_item_t		*lip = bp->b_fspriv;
> -	xfs_buf_log_item_t	*bip;
> +	struct xfs_log_item	*lip = bp->b_fspriv;
> +	struct xfs_buf_log_item	*bip;
>  	int			chunks;
>  	int			map_size;
>  	int			error;
> @@ -766,12 +766,11 @@ xfs_buf_item_init(
>  	 */
>  	ASSERT(bp->b_target->bt_mount == mp);
>  	if (lip != NULL && lip->li_type == XFS_LI_BUF)
> -		return;
> +		return 0;
>  
>  	bip = kmem_zone_zalloc(xfs_buf_item_zone, KM_SLEEP);
>  	xfs_log_item_init(mp, &bip->bli_item, XFS_LI_BUF, &xfs_buf_item_ops);
>  	bip->bli_buf = bp;
> -	xfs_buf_hold(bp);
>  
>  	/*
>  	 * chunks is the number of XFS_BLF_CHUNK size pieces the buffer
> @@ -784,6 +783,11 @@ xfs_buf_item_init(
>  	 */
>  	error = xfs_buf_item_get_format(bip, bp->b_map_count);
>  	ASSERT(error == 0);
> +	if (error) {	/* to stop gcc throwing set-but-unused warnings */
> +		kmem_zone_free(xfs_buf_item_zone, bip);
> +		return error;
> +	}
> +
>  
>  	for (i = 0; i < bip->bli_format_count; i++) {
>  		chunks = DIV_ROUND_UP(BBTOB(bp->b_maps[i].bm_len),
> @@ -803,6 +807,8 @@ xfs_buf_item_init(
>  	if (bp->b_fspriv)
>  		bip->bli_item.li_bio_list = bp->b_fspriv;
>  	bp->b_fspriv = bip;
> +	xfs_buf_hold(bp);
> +	return 0;
>  }
>  
>  
> diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
> index 3f3455a..f7eba99 100644
> --- a/fs/xfs/xfs_buf_item.h
> +++ b/fs/xfs/xfs_buf_item.h
> @@ -61,7 +61,7 @@ typedef struct xfs_buf_log_item {
>  	struct xfs_buf_log_format __bli_format;	/* embedded in-log header */
>  } xfs_buf_log_item_t;
>  
> -void	xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *);
> +int	xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *);
>  void	xfs_buf_item_relse(struct xfs_buf *);
>  void	xfs_buf_item_log(xfs_buf_log_item_t *, uint, uint);
>  uint	xfs_buf_item_dirty(xfs_buf_log_item_t *);
> -- 
> 2.5.0
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-24 12:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-23 22:58 [PATCH] xfs: fix non-debug build warnings Dave Chinner
2015-08-24 12:41 ` Brian Foster

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox