Skip to content

Commit e0d8f7d

Browse files
committed
false use-after-move on store
Fixes: https://tracker.ceph.com/issues/66709 Signed-off-by: Suyash Dongre <[email protected]>
1 parent 6fc2885 commit e0d8f7d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/ceph_osd.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,9 @@ int main(int argc, const char **argv)
375375
<< " for osd." << whoami
376376
<< " fsid " << g_conf().get_val<uuid_d>("fsid")
377377
<< dendl;
378+
forker.exit(0);
378379
}
379-
if (mkfs || mkkey) {
380+
if (mkkey) {
380381
forker.exit(0);
381382
}
382383
if (mkjournal) {

src/common/Preforker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class Preforker {
126126
}
127127
return r;
128128
}
129-
void exit(int r) {
129+
[[noreturn]] void exit(int r) {
130130
if (is_child())
131131
signal_exit(r);
132132
::exit(r);

0 commit comments

Comments
 (0)