xfs
[Top] [All Lists]

Re: [PATCH] repair: fix a few message formats in process_dinode_int

To: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Subject: Re: [PATCH] repair: fix a few message formats in process_dinode_int
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Tue, 21 Feb 2012 21:26:04 -0600
Cc: xfs@xxxxxxxxxxx
In-reply-to: <20120209181959.GA28010@xxxxxxxxxxxxx>
References: <20120209181959.GA28010@xxxxxxxxxxxxx>
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2
On 2/9/12 12:19 PM, Christoph Hellwig wrote:
> Always out�ut newline after messages, and skip corruptions warnings
> if handling uncertain inodes.
> 
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>

> 
> Index: xfsprogs-dev/repair/dinode.c
> ===================================================================
> --- xfsprogs-dev.orig/repair/dinode.c 2012-02-05 05:59:08.441922905 -0800
> +++ xfsprogs-dev/repair/dinode.c      2012-02-06 11:56:36.689502813 -0800
> @@ -2552,16 +2552,22 @@ _("bad (negative) size %" PRId64 " on in
>               uint16_t flags = be16_to_cpu(dino->di_flags);
>  
>               if (flags & ~XFS_DIFLAG_ANY) {
> -                     do_warn(_("Bad flags set in inode %" PRIu64), lino);
> +                     if (!uncertain) {
> +                             do_warn(
> +     _("Bad flags set in inode %" PRIu64 "\n"),
> +                                     lino);
> +                     }
>                       flags &= ~XFS_DIFLAG_ANY;
>               }
>  
>               if (flags & (XFS_DIFLAG_REALTIME | XFS_DIFLAG_RTINHERIT)) {
>                       /* need an rt-dev! */
>                       if (!rt_name) {
> -                             do_warn(
> -     _("inode %" PRIu64 " has RT flag set but there is no RT device"),
> -                                     lino);
> +                             if (!uncertain) {
> +                                     do_warn(
> +     _("inode %" PRIu64 " has RT flag set but there is no RT device\n"),
> +                                             lino);
> +                             }
>                               flags &= ~(XFS_DIFLAG_REALTIME |
>                                               XFS_DIFLAG_RTINHERIT);
>                       }
> @@ -2569,8 +2575,11 @@ _("bad (negative) size %" PRId64 " on in
>               if (flags & XFS_DIFLAG_NEWRTBM) {
>                       /* must be a rt bitmap inode */
>                       if (lino != mp->m_sb.sb_rbmino) {
> -                             do_warn(_("inode %" PRIu64 " not rt bitmap"),
> -                                     lino);
> +                             if (!uncertain) {
> +                                     do_warn(
> +     _("inode %" PRIu64 " not rt bitmap\n"),
> +                                             lino);
> +                             }
>                               flags &= ~XFS_DIFLAG_NEWRTBM;
>                       }
>               }
> @@ -2580,9 +2589,11 @@ _("bad (negative) size %" PRId64 " on in
>                            XFS_DIFLAG_NOSYMLINKS)) {
>                       /* must be a directory */
>                       if (di_mode && !S_ISDIR(di_mode)) {
> -                             do_warn(
> -     _("directory flags set on non-directory inode %" PRIu64 ),
> -                                     lino);
> +                             if (!uncertain) {
> +                                     do_warn(
> +     _("directory flags set on non-directory inode %" PRIu64 "\n" ),
> +                                             lino);
> +                             }
>                               flags &= ~(XFS_DIFLAG_RTINHERIT |
>                                               XFS_DIFLAG_EXTSZINHERIT |
>                                               XFS_DIFLAG_PROJINHERIT |
> @@ -2592,9 +2603,11 @@ _("bad (negative) size %" PRId64 " on in
>               if (flags & (XFS_DIFLAG_REALTIME | XFS_XFLAG_EXTSIZE)) {
>                       /* must be a file */
>                       if (di_mode && !S_ISREG(di_mode)) {
> -                             do_warn(
> -     _("file flags set on non-file inode %" PRIu64),
> -                                     lino);
> +                             if (!uncertain) {
> +                                     do_warn(
> +     _("file flags set on non-file inode %" PRIu64 "\n"),
> +                                             lino);
> +                             }
>                               flags &= ~(XFS_DIFLAG_REALTIME |
>                                               XFS_XFLAG_EXTSIZE);
>                       }
> 
> 
> 
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

<Prev in Thread] Current Thread [Next in Thread>