From: Brian Foster <bfoster@redhat.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>,
linux-xfs@vger.kernel.org, Dave Chinner <dchinner@redhat.com>,
Eric Sandeen <sandeen@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] xfs: fix unused variable warnings
Date: Thu, 2 Nov 2017 08:44:03 -0400 [thread overview]
Message-ID: <20171102124403.GC16645@bfoster.bfoster> (raw)
In-Reply-To: <20171102111137.3062126-2-arnd@arndb.de>
On Thu, Nov 02, 2017 at 12:11:13PM +0100, Arnd Bergmann wrote:
> fs/xfs/libxfs/xfs_bmap.c: In function 'xfs_bmap_del_extent_delay':
> fs/xfs/libxfs/xfs_bmap.c:4648:20: error: unused variable 'ifp' [-Werror=unused-variable]
> struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
> ^~~
> fs/xfs/libxfs/xfs_bmap.c: In function 'xfs_bmap_del_extent_cow':
> fs/xfs/libxfs/xfs_bmap.c:4776:20: error: unused variable 'ifp' [-Werror=unused-variable]
>
> Fixes: ca5d8e5b7b90 ("xfs: move pre/post-bmap tracing into xfs_iext_update_extent")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
Thanks for sending this:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_bmap.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index f45f05c45e15..fa85b08b8fe2 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4645,7 +4645,6 @@ xfs_bmap_del_extent_delay(
> struct xfs_bmbt_irec *del)
> {
> struct xfs_mount *mp = ip->i_mount;
> - struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
> struct xfs_bmbt_irec new;
> int64_t da_old, da_new, da_diff = 0;
> xfs_fileoff_t del_endoff, got_endoff;
> @@ -4663,7 +4662,7 @@ xfs_bmap_del_extent_delay(
> da_new = 0;
>
> ASSERT(*idx >= 0);
> - ASSERT(*idx <= xfs_iext_count(ifp));
> + ASSERT(*idx <= xfs_iext_count(XFS_IFORK_PTR(ip, whichfork)));
> ASSERT(del->br_blockcount > 0);
> ASSERT(got->br_startoff <= del->br_startoff);
> ASSERT(got_endoff >= del_endoff);
> @@ -4773,7 +4772,6 @@ xfs_bmap_del_extent_cow(
> struct xfs_bmbt_irec *del)
> {
> struct xfs_mount *mp = ip->i_mount;
> - struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
> struct xfs_bmbt_irec new;
> xfs_fileoff_t del_endoff, got_endoff;
> int state = BMAP_COWFORK;
> @@ -4784,7 +4782,7 @@ xfs_bmap_del_extent_cow(
> got_endoff = got->br_startoff + got->br_blockcount;
>
> ASSERT(*idx >= 0);
> - ASSERT(*idx <= xfs_iext_count(ifp));
> + ASSERT(*idx <= xfs_iext_count(XFS_IFORK_PTR(ip, XFS_COW_FORK)));
> ASSERT(del->br_blockcount > 0);
> ASSERT(got->br_startoff <= del->br_startoff);
> ASSERT(got_endoff >= del_endoff);
> --
> 2.9.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-11-02 12:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 11:11 [PATCH 1/2] xfs: scrub: avoid uninitialized return code Arnd Bergmann
2017-11-02 11:11 ` [PATCH 2/2] xfs: fix unused variable warnings Arnd Bergmann
2017-11-02 12:44 ` Brian Foster [this message]
2017-11-02 16:52 ` Darrick J. Wong
2017-11-02 12:44 ` [PATCH 1/2] xfs: scrub: avoid uninitialized return code Brian Foster
2017-11-02 16:49 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171102124403.GC16645@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=arnd@arndb.de \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).