bcachefs: replace memcpy with memcpy_and_pad for jset_entry_log->d buff

This was achieved before by zero-ing out the source buffer and then
copying the bytes into the destination buffer. This can also be done with
memcpy_and_pad which will zero out only the destination buffer if its
size is bigger than the size of the source buffer. This is already used in
the same way in journal_transaction_name().

Moreover, zero-ing the source buffer was done twice, first in
__bch2_fs_log_msg() and then in bch2_trans_log_msg(). And this method
may also require allocating some extra memory for the source buffer.

In conclusion, using memcpy_and_pad is better even tough the result is
the same because it brings uniformity with what's already used in
journal_transaction_name, it avoids code duplication and reallocating
extra memory.

Signed-off-by: Roxana Nicolescu <nicolescu.roxana@protonmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c
index 1e6b7836cc01f65d13d39a04ca838a07a722ebee..2bffd5121c31592c4a0c52f228c81b2b272b6de7 100644 (file)
--- a/fs/bcachefs/btree_update.c
+++ b/fs/bcachefs/btree_update.c
@@ -14,6 +14,8 @@
 #include "snapshot.h"
 #include "trace.h"
 
+#include <linux/string_helpers.h>
+
 static inline int btree_insert_entry_cmp(const struct btree_insert_entry *l,
                                         const struct btree_insert_entry *r)
 {
@@ -829,7 +831,6 @@ int bch2_btree_bit_mod_buffered(struct btree_trans *trans, enum btree_id btree,
 int bch2_trans_log_msg(struct btree_trans *trans, struct printbuf *buf)
 {
        unsigned u64s = DIV_ROUND_UP(buf->pos, sizeof(u64));
-       prt_chars(buf, '\0', u64s * sizeof(u64) - buf->pos);
 
        int ret = buf->allocation_failure ? -BCH_ERR_ENOMEM_trans_log_msg : 0;
        if (ret)
@@ -842,7 +843,7 @@ int bch2_trans_log_msg(struct btree_trans *trans, struct printbuf *buf)
 
        struct jset_entry_log *l = container_of(e, struct jset_entry_log, entry);
        journal_entry_init(e, BCH_JSET_ENTRY_log, 0, 1, u64s);
-       memcpy(l->d, buf->buf, buf->pos);
+       memcpy_and_pad(l->d, u64s * sizeof(u64), buf->buf, buf->pos, 0);
        return 0;
 }
 
@@ -868,7 +869,6 @@ __bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt,
        prt_vprintf(&buf, fmt, args);
 
        unsigned u64s = DIV_ROUND_UP(buf.pos, sizeof(u64));
-       prt_chars(&buf, '\0', u64s * sizeof(u64) - buf.pos);
 
        int ret = buf.allocation_failure ? -BCH_ERR_ENOMEM_trans_log_msg : 0;
        if (ret)
@@ -881,7 +881,7 @@ __bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt,
 
                struct jset_entry_log *l = (void *) &darray_top(c->journal.early_journal_entries);
                journal_entry_init(&l->entry, BCH_JSET_ENTRY_log, 0, 1, u64s);
-               memcpy(l->d, buf.buf, buf.pos);
+               memcpy_and_pad(l->d, u64s * sizeof(u64), buf.buf, buf.pos, 0);
                c->journal.early_journal_entries.nr += jset_u64s(u64s);
        } else {
                ret = bch2_trans_commit_do(c, NULL, NULL, commit_flags,