From: Eric Sandeen <sandeen@sandeen.net>
To: Christoph Hellwig <hch@infradead.org>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH] repair: fix a few message formats in process_dinode_int
Date: Tue, 21 Feb 2012 21:26:04 -0600 [thread overview]
Message-ID: <4F44604C.1000201@sandeen.net> (raw)
In-Reply-To: <20120209181959.GA28010@infradead.org>
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@lst.de>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
>
> 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@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2012-02-22 3:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 18:19 [PATCH] repair: fix a few message formats in process_dinode_int Christoph Hellwig
2012-02-17 17:23 ` Christoph Hellwig
2012-02-22 3:26 ` Eric Sandeen [this message]
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=4F44604C.1000201@sandeen.net \
--to=sandeen@sandeen.net \
--cc=hch@infradead.org \
--cc=xfs@oss.sgi.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