* [PATCH] repair: fix a few message formats in process_dinode_int
@ 2012-02-09 18:19 Christoph Hellwig
2012-02-17 17:23 ` Christoph Hellwig
2012-02-22 3:26 ` Eric Sandeen
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Hellwig @ 2012-02-09 18:19 UTC (permalink / raw)
To: xfs
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 2468 bytes --]
Always out¶ut newline after messages, and skip corruptions warnings
if handling uncertain inodes.
Signed-off-by: Christoph Hellwig <hch@lst.de>
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);
}
[-- Attachment #2: Type: text/plain, Size: 121 bytes --]
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] repair: fix a few message formats in process_dinode_int
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
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2012-02-17 17:23 UTC (permalink / raw)
To: xfs
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 2858 bytes --]
ping?
On Thu, Feb 09, 2012 at 01:19:59PM -0500, 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>
>
> 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
---end quoted text---
[-- Attachment #2: Type: text/plain, Size: 121 bytes --]
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] repair: fix a few message formats in process_dinode_int
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
1 sibling, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2012-02-22 3:26 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: xfs
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-22 3:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox