From: Kent Overstreet Date: Sun, 4 Apr 2021 01:09:13 +0000 (-0400) Subject: bcachefs: Drop some memset() calls X-Git-Tag: v6.7-rc1~201^2~1675 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08e337618f67abb9be1ff4b022a14e8721c5def2;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Drop some memset() calls gcc is emitting rep stos here, which is silly (and slow) for an 8 byte memset. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h index 455f2fe4929ca..07d9b6d36e51f 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -174,8 +174,11 @@ static inline void bch2_btree_iter_set_pos(struct btree_iter *iter, struct bpos if (!(iter->flags & BTREE_ITER_ALL_SNAPSHOTS)) new_pos.snapshot = iter->snapshot; - bkey_init(&iter->k); - iter->k.p = iter->pos = new_pos; + iter->k.type = KEY_TYPE_deleted; + iter->k.p.inode = iter->pos.inode = new_pos.inode; + iter->k.p.offset = iter->pos.offset = new_pos.offset; + iter->k.p.snapshot = iter->pos.snapshot = new_pos.snapshot; + iter->k.size = 0; } /* Sort order for locking btree iterators: */