[PATCH] xfsprogs: add missing carriage returns in libxfs/rdwr.c

[PATCH] xfsprogs: add missing carriage returns in libxfs/rdwr.c

[John Pittman]

In libxfs/rdwr.c, there are several fprintf() calls that are
missing trailing carriage returns. This translates to the
following CLI prompt being on the same line as the message.
Add missing carriage returns, alleviating the issue.

Fixes: 0a7942b38215 ("libxfs: don't discard dirty buffers")
Signed-off-by: John Pittman <jpittman@redhat.com>
---
 libxfs/rdwr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 7080cd9c..3f69192d 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -651,7 +651,7 @@ __libxfs_getbufr(int blen)
 	pthread_mutex_unlock(&xfs_buf_freelist.cm_mutex);
 	bp->b_ops = NULL;
 	if (bp->b_flags & LIBXFS_B_DIRTY)
-		fprintf(stderr, "found dirty buffer (bulk) on free list!");
+		fprintf(stderr, "found dirty buffer (bulk) on free list!\n");
 
 	return bp;
 }
@@ -1224,7 +1224,7 @@ libxfs_brelse(
 		return;
 	if (bp->b_flags & LIBXFS_B_DIRTY)
 		fprintf(stderr,
-			"releasing dirty buffer to free list!");
+			"releasing dirty buffer to free list!\n");
 
 	pthread_mutex_lock(&xfs_buf_freelist.cm_mutex);
 	list_add(&bp->b_node.cn_mru, &xfs_buf_freelist.cm_list);
@@ -1245,7 +1245,7 @@ libxfs_bulkrelse(
 	list_for_each_entry(bp, list, b_node.cn_mru) {
 		if (bp->b_flags & LIBXFS_B_DIRTY)
 			fprintf(stderr,
-				"releasing dirty buffer (bulk) to free list!");
+				"releasing dirty buffer (bulk) to free list!\n");
 		count++;
 	}
 
-- 
2.17.2

Re: [PATCH] xfsprogs: add missing carriage returns in libxfs/rdwr.c

[Pavel Reichl]

On Fri, Nov 22, 2019 at 10:31 PM John Pittman <jpittman@redhat.com> wrote:
>
> In libxfs/rdwr.c, there are several fprintf() calls that are
> missing trailing carriage returns. This translates to the
> following CLI prompt being on the same line as the message.
> Add missing carriage returns, alleviating the issue.
>
> Fixes: 0a7942b38215 ("libxfs: don't discard dirty buffers")
> Signed-off-by: John Pittman <jpittman@redhat.com>
> ---
>  libxfs/rdwr.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
> index 7080cd9c..3f69192d 100644
> --- a/libxfs/rdwr.c
> +++ b/libxfs/rdwr.c
> @@ -651,7 +651,7 @@ __libxfs_getbufr(int blen)
>         pthread_mutex_unlock(&xfs_buf_freelist.cm_mutex);
>         bp->b_ops = NULL;
>         if (bp->b_flags & LIBXFS_B_DIRTY)
> -               fprintf(stderr, "found dirty buffer (bulk) on free list!");
> +               fprintf(stderr, "found dirty buffer (bulk) on free list!\n");
>
>         return bp;
>  }
> @@ -1224,7 +1224,7 @@ libxfs_brelse(
>                 return;
>         if (bp->b_flags & LIBXFS_B_DIRTY)
>                 fprintf(stderr,
> -                       "releasing dirty buffer to free list!");
> +                       "releasing dirty buffer to free list!\n");
>
>         pthread_mutex_lock(&xfs_buf_freelist.cm_mutex);
>         list_add(&bp->b_node.cn_mru, &xfs_buf_freelist.cm_list);
> @@ -1245,7 +1245,7 @@ libxfs_bulkrelse(
>         list_for_each_entry(bp, list, b_node.cn_mru) {
>                 if (bp->b_flags & LIBXFS_B_DIRTY)
>                         fprintf(stderr,
> -                               "releasing dirty buffer (bulk) to free list!");
> +                               "releasing dirty buffer (bulk) to free list!\n");
>                 count++;
>         }
>
> --
> 2.17.2
>

Hello John,

it seems to me that you are confusing carriage return (CR, \r) and
line feed (LF, \n) in the commit description. Could you check that
out, please? Otherwise it looks good to me.

Thanks.

Pave Reichl

Re: [PATCH] xfsprogs: add missing carriage returns in libxfs/rdwr.c

[John Pittman]

You're exactly right Pavel; thanks for the clarification. Sending v2 now.

On Sat, Nov 23, 2019 at 2:08 AM Pavel Reichl <preichl@redhat.com> wrote:
>
> On Fri, Nov 22, 2019 at 10:31 PM John Pittman <jpittman@redhat.com> wrote:
> >
> > In libxfs/rdwr.c, there are several fprintf() calls that are
> > missing trailing carriage returns. This translates to the
> > following CLI prompt being on the same line as the message.
> > Add missing carriage returns, alleviating the issue.
> >
> > Fixes: 0a7942b38215 ("libxfs: don't discard dirty buffers")
> > Signed-off-by: John Pittman <jpittman@redhat.com>
> > ---
> >  libxfs/rdwr.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
> > index 7080cd9c..3f69192d 100644
> > --- a/libxfs/rdwr.c
> > +++ b/libxfs/rdwr.c
> > @@ -651,7 +651,7 @@ __libxfs_getbufr(int blen)
> >         pthread_mutex_unlock(&xfs_buf_freelist.cm_mutex);
> >         bp->b_ops = NULL;
> >         if (bp->b_flags & LIBXFS_B_DIRTY)
> > -               fprintf(stderr, "found dirty buffer (bulk) on free list!");
> > +               fprintf(stderr, "found dirty buffer (bulk) on free list!\n");
> >
> >         return bp;
> >  }
> > @@ -1224,7 +1224,7 @@ libxfs_brelse(
> >                 return;
> >         if (bp->b_flags & LIBXFS_B_DIRTY)
> >                 fprintf(stderr,
> > -                       "releasing dirty buffer to free list!");
> > +                       "releasing dirty buffer to free list!\n");
> >
> >         pthread_mutex_lock(&xfs_buf_freelist.cm_mutex);
> >         list_add(&bp->b_node.cn_mru, &xfs_buf_freelist.cm_list);
> > @@ -1245,7 +1245,7 @@ libxfs_bulkrelse(
> >         list_for_each_entry(bp, list, b_node.cn_mru) {
> >                 if (bp->b_flags & LIBXFS_B_DIRTY)
> >                         fprintf(stderr,
> > -                               "releasing dirty buffer (bulk) to free list!");
> > +                               "releasing dirty buffer (bulk) to free list!\n");
> >                 count++;
> >         }
> >
> > --
> > 2.17.2
> >
>
> Hello John,
>
> it seems to me that you are confusing carriage return (CR, \r) and
> line feed (LF, \n) in the commit description. Could you check that
> out, please? Otherwise it looks good to me.
>
> Thanks.
>
> Pave Reichl
>