diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-04-02 13:33:16 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-04-02 13:33:16 +0300 |
| commit | e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf (patch) | |
| tree | 5f762f2992658891c565af4f923147b384bf0dd4 /fs/btrfs/dev-replace.c | |
| parent | f2ac256b9a8b7e79847efcd82bd10fd876369b9f (diff) | |
| parent | a5e13c6df0e41702d2b2c77c8ad41677ebb065b3 (diff) | |
| download | linux-e855e80d001530ec0bbb1ee1ca6a16ac6bdf9acf.tar.xz | |
Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes
In particular we want to have this upstream commit:
b90829704780: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")
... before merging in x86/cpu changes and the removal of the NOP optimizations, and
applying PeterZ's !retpoline objtool series.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 3a9c1e046ebe..d05f73530af7 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -81,6 +81,9 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) struct btrfs_dev_replace_item *ptr; u64 src_devid; + if (!dev_root) + return 0; + path = btrfs_alloc_path(); if (!path) { ret = -ENOMEM; |