Skip to contentSkip to conversation

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

PATCH Superseded John Pittman 2 participants 3 messages Nov 22, 2019 – Nov 23, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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

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")
---
 libxfs/rdwr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
libxfs/rdwr.c +3 -3
index 7080cd9c..3f69192d 100644
@@ -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++;
 	}
 
Signature · 1 line
2.17.2
#1 lore raw
Quoted 44 lines · 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")
---
 libxfs/rdwr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
libxfs/rdwr.c +3 -4
index 7080cd9c..3f69192d 100644
@@ -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++;
        }
 
--
Quoted 2 lines

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

#2 lore raw

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

Quoted 59 lines · Pavel Reichl
Quoted 44 lines · 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")
---
 libxfs/rdwr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
libxfs/rdwr.c +3 -4
index 7080cd9c..3f69192d 100644
@@ -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++;
        }
 
--
Quoted 2 lines

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