Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bcachefs: Kill memset() in bch2_btree_iter_init()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

+19 -10
+7
fs/bcachefs/bcachefs_format.h
··· 307 307 struct bch_val v; 308 308 }; 309 309 310 + #define POS_KEY(_pos) \ 311 + ((struct bkey) { \ 312 + .u64s = BKEY_U64s, \ 313 + .format = KEY_FORMAT_CURRENT, \ 314 + .p = _pos, \ 315 + }) 316 + 310 317 #define KEY(_inode, _offset, _size) \ 311 318 ((struct bkey) { \ 312 319 .u64s = BKEY_U64s, \
+11 -8
fs/bcachefs/btree_iter.h
··· 445 445 unsigned flags, 446 446 unsigned long ip) 447 447 { 448 - memset(iter, 0, sizeof(*iter)); 449 - iter->trans = trans; 450 - iter->btree_id = btree_id; 451 - iter->flags = flags; 452 - iter->snapshot = pos.snapshot; 453 - iter->pos = pos; 454 - iter->k.p = pos; 455 - 448 + iter->trans = trans; 449 + iter->update_path = NULL; 450 + iter->key_cache_path = NULL; 451 + iter->btree_id = btree_id; 452 + iter->min_depth = 0; 453 + iter->flags = flags; 454 + iter->snapshot = pos.snapshot; 455 + iter->pos = pos; 456 + iter->k = POS_KEY(pos); 457 + iter->journal_idx = 0; 458 + iter->journal_pos = POS_MIN; 456 459 #ifdef CONFIG_BCACHEFS_DEBUG 457 460 iter->ip_allocated = ip; 458 461 #endif
+1 -2
fs/bcachefs/btree_types.h
··· 287 287 struct btree_path *key_cache_path; 288 288 289 289 enum btree_id btree_id:8; 290 - unsigned min_depth:3; 291 - unsigned advanced:1; 290 + u8 min_depth; 292 291 293 292 /* btree_iter_copy starts here: */ 294 293 u16 flags;