[PATCH 2/2] xfs: enhance warning on xfs_imap() failure in xfs_iunlink_remove()

[Dave Chinner]

On Thu, Apr 25, 2013 at 11:41:30AM -0400, Brian Foster wrote:
> From: Eric Sandeen <sandeen at redhat.com>
> 
> Include the global ino, ag number and agino in the warning message
> emitted should xfs_imap() fail in the xfs_iunlink_remove() code
> path.
> 
> Signed-off-by: Brian Foster <bfoster at redhat.com>
> ---
>  fs/xfs/xfs_inode.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index c22f980..a4fe989 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -1678,8 +1678,10 @@ xfs_iunlink_remove(
>  			error = xfs_imap(mp, tp, next_ino, &imap, 0);
>  			if (error) {
>  				xfs_warn(mp,
> -	"%s: xfs_imap returned error %d.",
> -					 __func__, error);
> +					"%s: xfs_imap() returned error %d "
> +					"for inode 0x%llx ag %d agino 0x%x",
> +					__func__, error, ip->i_ino, agno, agino);
> +

The fact the format string is now split across 2 lines makes it hard
to grep for. The indentation should be a clue that the warning code
is intentionally formatted that way so that long format strings
don't get wrapped. i.e:

 				xfs_warn(mp,
-	"%s: xfs_imap returned error %d.",
-					 __func__, error);
+	"%s: xfs_imap() returned error %d for inode 0x%llx ag %d agino 0x%x",
+					__func__, error, ip->i_ino,
+					agno, agino);

fits into 80 columns and is much easier to read than the highly
indented version split across 2 lines....

Cheers,

Dave.
-- 
Dave Chinner
david at fromorbit.com