diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-28 07:44:50 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-06 07:24:19 +0300 |
| commit | 089e311347ebe347a79545ca117a02811623c91e (patch) | |
| tree | 9d0034dcd3b1cce3efa2b6978c342dea06b32907 | |
| parent | ad00bce07da8138c08f6585f153412b65c99b064 (diff) | |
| download | linux-089e311347ebe347a79545ca117a02811623c91e.tar.xz | |
bcachefs: Kill BTREE_TRIGGER_NOATOMIC
dead code
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/bkey_methods.h | 2 | ||||
| -rw-r--r-- | fs/bcachefs/btree_gc.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h index da934d8f75fe..896020055097 100644 --- a/fs/bcachefs/bkey_methods.h +++ b/fs/bcachefs/bkey_methods.h @@ -102,7 +102,6 @@ enum btree_update_flags { __BTREE_TRIGGER_GC, __BTREE_TRIGGER_BUCKET_INVALIDATE, - __BTREE_TRIGGER_NOATOMIC, }; #define BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE (1U << __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) @@ -116,7 +115,6 @@ enum btree_update_flags { #define BTREE_TRIGGER_GC (1U << __BTREE_TRIGGER_GC) #define BTREE_TRIGGER_BUCKET_INVALIDATE (1U << __BTREE_TRIGGER_BUCKET_INVALIDATE) -#define BTREE_TRIGGER_NOATOMIC (1U << __BTREE_TRIGGER_NOATOMIC) static inline int bch2_trans_mark_key(struct btree_trans *trans, enum btree_id btree_id, unsigned level, diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c index 88e069d7a7bb..7858c4cccf3d 100644 --- a/fs/bcachefs/btree_gc.c +++ b/fs/bcachefs/btree_gc.c @@ -813,9 +813,6 @@ static int bch2_gc_mark_key(struct btree_trans *trans, enum btree_id btree_id, struct bch_fs *c = trans->c; struct bkey deleted = KEY(0, 0, 0); struct bkey_s_c old = (struct bkey_s_c) { &deleted, NULL }; - unsigned flags = - BTREE_TRIGGER_GC| - (initial ? BTREE_TRIGGER_NOATOMIC : 0); int ret = 0; deleted.p = k->k->p; @@ -837,7 +834,7 @@ static int bch2_gc_mark_key(struct btree_trans *trans, enum btree_id btree_id, } ret = commit_do(trans, NULL, NULL, 0, - bch2_mark_key(trans, btree_id, level, old, unsafe_bkey_s_c_to_s(*k), flags)); + bch2_mark_key(trans, btree_id, level, old, unsafe_bkey_s_c_to_s(*k), BTREE_TRIGGER_GC)); fsck_err: err: bch_err_fn(c, ret); |