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
ba11c7d6
Commit
ba11c7d6
authored
Nov 20, 2023
by
Kent Overstreet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcachefs: BCH_DATA_OP_drop_extra_replicas
Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
3c843a67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
7 deletions
+46
-7
fs/bcachefs/bcachefs_ioctl.h
fs/bcachefs/bcachefs_ioctl.h
+2
-1
fs/bcachefs/move.c
fs/bcachefs/move.c
+44
-6
No files found.
fs/bcachefs/bcachefs_ioctl.h
View file @
ba11c7d6
...
@@ -177,7 +177,8 @@ struct bch_ioctl_disk_set_state {
...
@@ -177,7 +177,8 @@ struct bch_ioctl_disk_set_state {
x(scrub, 0) \
x(scrub, 0) \
x(rereplicate, 1) \
x(rereplicate, 1) \
x(migrate, 2) \
x(migrate, 2) \
x(rewrite_old_nodes, 3)
x(rewrite_old_nodes, 3) \
x(drop_extra_replicas, 4)
enum
bch_data_ops
{
enum
bch_data_ops
{
#define x(t, n) BCH_DATA_OP_##t = n,
#define x(t, n) BCH_DATA_OP_##t = n,
...
...
fs/bcachefs/move.c
View file @
ba11c7d6
...
@@ -1013,6 +1013,41 @@ int bch2_scan_old_btree_nodes(struct bch_fs *c, struct bch_move_stats *stats)
...
@@ -1013,6 +1013,41 @@ int bch2_scan_old_btree_nodes(struct bch_fs *c, struct bch_move_stats *stats)
return
ret
;
return
ret
;
}
}
static
bool
drop_extra_replicas_pred
(
struct
bch_fs
*
c
,
void
*
arg
,
struct
bkey_s_c
k
,
struct
bch_io_opts
*
io_opts
,
struct
data_update_opts
*
data_opts
)
{
unsigned
durability
=
bch2_bkey_durability
(
c
,
k
);
unsigned
replicas
=
bkey_is_btree_ptr
(
k
.
k
)
?
c
->
opts
.
metadata_replicas
:
io_opts
->
data_replicas
;
const
union
bch_extent_entry
*
entry
;
struct
extent_ptr_decoded
p
;
unsigned
i
=
0
;
bkey_for_each_ptr_decode
(
k
.
k
,
bch2_bkey_ptrs_c
(
k
),
p
,
entry
)
{
unsigned
d
=
bch2_extent_ptr_durability
(
c
,
&
p
);
if
(
d
&&
durability
-
d
>=
replicas
)
{
data_opts
->
kill_ptrs
|=
BIT
(
i
);
durability
-=
d
;
}
i
++
;
}
return
data_opts
->
kill_ptrs
!=
0
;
}
static
bool
drop_extra_replicas_btree_pred
(
struct
bch_fs
*
c
,
void
*
arg
,
struct
btree
*
b
,
struct
bch_io_opts
*
io_opts
,
struct
data_update_opts
*
data_opts
)
{
return
drop_extra_replicas_pred
(
c
,
arg
,
bkey_i_to_s_c
(
&
b
->
key
),
io_opts
,
data_opts
);
}
int
bch2_data_job
(
struct
bch_fs
*
c
,
int
bch2_data_job
(
struct
bch_fs
*
c
,
struct
bch_move_stats
*
stats
,
struct
bch_move_stats
*
stats
,
struct
bch_ioctl_data
op
)
struct
bch_ioctl_data
op
)
...
@@ -1030,11 +1065,8 @@ int bch2_data_job(struct bch_fs *c,
...
@@ -1030,11 +1065,8 @@ int bch2_data_job(struct bch_fs *c,
case
BCH_DATA_OP_rereplicate
:
case
BCH_DATA_OP_rereplicate
:
stats
->
data_type
=
BCH_DATA_journal
;
stats
->
data_type
=
BCH_DATA_journal
;
ret
=
bch2_journal_flush_device_pins
(
&
c
->
journal
,
-
1
);
ret
=
bch2_journal_flush_device_pins
(
&
c
->
journal
,
-
1
);
ret
=
bch2_move_btree
(
c
,
start
,
end
,
ret
=
bch2_move_btree
(
c
,
start
,
end
,
rereplicate_btree_pred
,
c
,
stats
)
?:
ret
;
rereplicate_btree_pred
,
c
,
stats
)
?:
ret
;
ret
=
bch2_replicas_gc2
(
c
)
?:
ret
;
ret
=
bch2_move_data
(
c
,
start
,
end
,
ret
=
bch2_move_data
(
c
,
start
,
end
,
NULL
,
NULL
,
stats
,
stats
,
...
@@ -1049,11 +1081,8 @@ int bch2_data_job(struct bch_fs *c,
...
@@ -1049,11 +1081,8 @@ int bch2_data_job(struct bch_fs *c,
stats
->
data_type
=
BCH_DATA_journal
;
stats
->
data_type
=
BCH_DATA_journal
;
ret
=
bch2_journal_flush_device_pins
(
&
c
->
journal
,
op
.
migrate
.
dev
);
ret
=
bch2_journal_flush_device_pins
(
&
c
->
journal
,
op
.
migrate
.
dev
);
ret
=
bch2_move_btree
(
c
,
start
,
end
,
ret
=
bch2_move_btree
(
c
,
start
,
end
,
migrate_btree_pred
,
&
op
,
stats
)
?:
ret
;
migrate_btree_pred
,
&
op
,
stats
)
?:
ret
;
ret
=
bch2_replicas_gc2
(
c
)
?:
ret
;
ret
=
bch2_move_data
(
c
,
start
,
end
,
ret
=
bch2_move_data
(
c
,
start
,
end
,
NULL
,
NULL
,
stats
,
stats
,
...
@@ -1065,6 +1094,15 @@ int bch2_data_job(struct bch_fs *c,
...
@@ -1065,6 +1094,15 @@ int bch2_data_job(struct bch_fs *c,
case
BCH_DATA_OP_rewrite_old_nodes
:
case
BCH_DATA_OP_rewrite_old_nodes
:
ret
=
bch2_scan_old_btree_nodes
(
c
,
stats
);
ret
=
bch2_scan_old_btree_nodes
(
c
,
stats
);
break
;
break
;
case
BCH_DATA_OP_drop_extra_replicas
:
ret
=
bch2_move_btree
(
c
,
start
,
end
,
drop_extra_replicas_btree_pred
,
c
,
stats
)
?:
ret
;
ret
=
bch2_move_data
(
c
,
start
,
end
,
NULL
,
stats
,
writepoint_hashed
((
unsigned
long
)
current
),
true
,
drop_extra_replicas_pred
,
c
)
?:
ret
;
ret
=
bch2_replicas_gc2
(
c
)
?:
ret
;
break
;
default:
default:
ret
=
-
EINVAL
;
ret
=
-
EINVAL
;
}
}
...
...
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