kevin/linux
1
Fork 0
Code

bcachefs: bch2_printbuf_strip_trailing_newline()

Browse Source 
Add a new helper to fix inode_to_text()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-05-26 22:20:34 -04:00
parent babe30fe8d
commit 3811f48aa3
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/bcachefs/inode.c
View File

@ -551,6 +551,8 @@ static void __bch2_inode_unpacked_to_text(struct printbuf *out,
prt_printf(out, #_name "=%llu\n", (u64) inode->_name); prt_printf(out, #_name "=%llu\n", (u64) inode->_name);
BCH_INODE_FIELDS_v3() BCH_INODE_FIELDS_v3()
#undef x #undef x
bch2_printbuf_strip_trailing_newline(out);
printbuf_indent_sub(out, 2); printbuf_indent_sub(out, 2);
} }

14
fs/bcachefs/printbuf.c
View File

@ -316,6 +316,20 @@ void bch2_prt_newline(struct printbuf *buf)
buf->cur_tabstop = 0; buf->cur_tabstop = 0;
} }
void bch2_printbuf_strip_trailing_newline(struct printbuf *out)
{
for (int p = out->pos - 1; p >= 0; --p) {
if (out->buf[p] == '\n') {
out->pos = p;
break;
}
if (out->buf[p] != ' ')
break;
}
printbuf_nul_terminate_reserved(out);
}
static void __prt_tab(struct printbuf *out) static void __prt_tab(struct printbuf *out)
{ {
int spaces = max_t(int, 0, cur_tabstop(out) - printbuf_linelen(out)); int spaces = max_t(int, 0, cur_tabstop(out) - printbuf_linelen(out));

1
fs/bcachefs/printbuf.h
View File

@ -115,6 +115,7 @@ void bch2_printbuf_indent_add(struct printbuf *, unsigned);
void bch2_printbuf_indent_sub(struct printbuf *, unsigned); void bch2_printbuf_indent_sub(struct printbuf *, unsigned);
void bch2_prt_newline(struct printbuf *); void bch2_prt_newline(struct printbuf *);
void bch2_printbuf_strip_trailing_newline(struct printbuf *);
void bch2_prt_tab(struct printbuf *); void bch2_prt_tab(struct printbuf *);
void bch2_prt_tab_rjust(struct printbuf *); void bch2_prt_tab_rjust(struct printbuf *);