diff options
| -rw-r--r-- | fs/bcachefs/dirent.c | 6 | ||||
| -rw-r--r-- | fs/bcachefs/disk_groups.c | 9 | ||||
| -rw-r--r-- | fs/bcachefs/journal_io.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/util.c | 13 | ||||
| -rw-r--r-- | fs/bcachefs/util.h | 2 | ||||
| -rw-r--r-- | fs/bcachefs/xattr.c | 10 |
6 files changed, 13 insertions, 29 deletions
diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c index 6f699b736b34..a43a24409d37 100644 --- a/fs/bcachefs/dirent.c +++ b/fs/bcachefs/dirent.c @@ -122,9 +122,9 @@ void bch2_dirent_to_text(struct printbuf *out, struct bch_fs *c, { struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k); - bch_scnmemcpy(out, d.v->d_name, - bch2_dirent_name_bytes(d)); - pr_buf(out, " -> %llu type %s", + pr_buf(out, "%.*s -> %llu type %s", + bch2_dirent_name_bytes(d), + d.v->d_name, d.v->d_type != DT_SUBVOL ? le64_to_cpu(d.v->d_inum) : le32_to_cpu(d.v->d_child_subvol), diff --git a/fs/bcachefs/disk_groups.c b/fs/bcachefs/disk_groups.c index a27fc4fb60d5..e411606fd38d 100644 --- a/fs/bcachefs/disk_groups.c +++ b/fs/bcachefs/disk_groups.c @@ -76,8 +76,9 @@ static int bch2_sb_disk_groups_validate(struct bch_sb *sb, for (g = sorted; g + 1 < sorted + nr_groups; g++) if (!BCH_GROUP_DELETED(g) && !group_cmp(&g[0], &g[1])) { - pr_buf(err, "duplicate label %llu.", BCH_GROUP_PARENT(g)); - bch_scnmemcpy(err, g->label, strnlen(g->label, sizeof(g->label))); + pr_buf(err, "duplicate label %llu.%.*s", + BCH_GROUP_PARENT(g), + (int) sizeof(g->label), g->label); goto err; } @@ -376,9 +377,7 @@ void bch2_disk_path_to_text(struct printbuf *out, v = path[--nr]; g = groups->entries + v; - bch_scnmemcpy(out, g->label, - strnlen(g->label, sizeof(g->label))); - + pr_buf(out, "%.*s", (int) sizeof(g->label), g->label); if (nr) pr_buf(out, "."); } diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index 56ba82156c70..4f0904a515a7 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -595,7 +595,7 @@ static void journal_entry_log_to_text(struct printbuf *out, struct bch_fs *c, struct jset_entry_log *l = container_of(entry, struct jset_entry_log, entry); unsigned bytes = vstruct_bytes(entry) - offsetof(struct jset_entry_log, d); - bch_scnmemcpy(out, l->d, strnlen(l->d, bytes)); + pr_buf(out, "%.*s", bytes, l->d); } struct jset_entry_ops { diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c index e7675b4597db..971f404a01e3 100644 --- a/fs/bcachefs/util.c +++ b/fs/bcachefs/util.c @@ -581,19 +581,6 @@ void memcpy_from_bio(void *dst, struct bio *src, struct bvec_iter src_iter) } } -void bch_scnmemcpy(struct printbuf *out, - const char *src, size_t len) -{ - size_t n = printbuf_remaining(out); - - if (n) { - n = min(n - 1, len); - memcpy(out->pos, src, n); - out->pos += n; - *out->pos = '\0'; - } -} - #include "eytzinger.h" static int alignment_ok(const void *base, size_t align) diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index e047e7860584..fc8ffa61bbeb 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -281,8 +281,6 @@ static inline void printbuf_newline(struct printbuf *buf) pr_buf(buf, " "); } -void bch_scnmemcpy(struct printbuf *, const char *, size_t); - int bch2_strtoint_h(const char *, int *); int bch2_strtouint_h(const char *, unsigned int *); int bch2_strtoll_h(const char *, long long *); diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c index a5122dbb2eb9..9cce3953ee0c 100644 --- a/fs/bcachefs/xattr.c +++ b/fs/bcachefs/xattr.c @@ -111,11 +111,11 @@ void bch2_xattr_to_text(struct printbuf *out, struct bch_fs *c, else pr_buf(out, "(unknown type %u)", xattr.v->x_type); - bch_scnmemcpy(out, xattr.v->x_name, - xattr.v->x_name_len); - pr_buf(out, ":"); - bch_scnmemcpy(out, xattr_val(xattr.v), - le16_to_cpu(xattr.v->x_val_len)); + pr_buf(out, "%.*s:%.*s", + xattr.v->x_name_len, + xattr.v->x_name, + le16_to_cpu(xattr.v->x_val_len), + (char *) xattr_val(xattr.v)); } static int bch2_xattr_get_trans(struct btree_trans *trans, struct bch_inode_info *inode, |