Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
089e3113
Commit
089e3113
authored
Dec 27, 2023
by
Kent Overstreet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcachefs: Kill BTREE_TRIGGER_NOATOMIC
dead code Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
ad00bce0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
6 deletions
+1
-6
fs/bcachefs/bkey_methods.h
fs/bcachefs/bkey_methods.h
+0
-2
fs/bcachefs/btree_gc.c
fs/bcachefs/btree_gc.c
+1
-4
No files found.
fs/bcachefs/bkey_methods.h
View file @
089e3113
...
@@ -102,7 +102,6 @@ enum btree_update_flags {
...
@@ -102,7 +102,6 @@ enum btree_update_flags {
__BTREE_TRIGGER_GC
,
__BTREE_TRIGGER_GC
,
__BTREE_TRIGGER_BUCKET_INVALIDATE
,
__BTREE_TRIGGER_BUCKET_INVALIDATE
,
__BTREE_TRIGGER_NOATOMIC
,
};
};
#define BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE (1U << __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE)
#define BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE (1U << __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE)
...
@@ -116,7 +115,6 @@ enum btree_update_flags {
...
@@ -116,7 +115,6 @@ enum btree_update_flags {
#define BTREE_TRIGGER_GC (1U << __BTREE_TRIGGER_GC)
#define BTREE_TRIGGER_GC (1U << __BTREE_TRIGGER_GC)
#define BTREE_TRIGGER_BUCKET_INVALIDATE (1U << __BTREE_TRIGGER_BUCKET_INVALIDATE)
#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
,
static
inline
int
bch2_trans_mark_key
(
struct
btree_trans
*
trans
,
enum
btree_id
btree_id
,
unsigned
level
,
enum
btree_id
btree_id
,
unsigned
level
,
...
...
fs/bcachefs/btree_gc.c
View file @
089e3113
...
@@ -813,9 +813,6 @@ static int bch2_gc_mark_key(struct btree_trans *trans, enum btree_id btree_id,
...
@@ -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
bch_fs
*
c
=
trans
->
c
;
struct
bkey
deleted
=
KEY
(
0
,
0
,
0
);
struct
bkey
deleted
=
KEY
(
0
,
0
,
0
);
struct
bkey_s_c
old
=
(
struct
bkey_s_c
)
{
&
deleted
,
NULL
};
struct
bkey_s_c
old
=
(
struct
bkey_s_c
)
{
&
deleted
,
NULL
};
unsigned
flags
=
BTREE_TRIGGER_GC
|
(
initial
?
BTREE_TRIGGER_NOATOMIC
:
0
);
int
ret
=
0
;
int
ret
=
0
;
deleted
.
p
=
k
->
k
->
p
;
deleted
.
p
=
k
->
k
->
p
;
...
@@ -837,7 +834,7 @@ static int bch2_gc_mark_key(struct btree_trans *trans, enum btree_id btree_id,
...
@@ -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
,
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:
fsck_err:
err:
err:
bch_err_fn
(
c
,
ret
);
bch_err_fn
(
c
,
ret
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment