diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-05-18 13:00:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-05-18 13:09:37 +0300 |
| commit | 7c0577f4e609f7278ebd6d21e2de82b42f110944 (patch) | |
| tree | 4136e3c6beb37726f16cf1f6270f3f16cde7897e /fs/super.c | |
| parent | 6b5dd716da8fc3aba65e6b7d992dea0cee2f9528 (diff) | |
| parent | b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce (diff) | |
| download | linux-stable-7c0577f4e609f7278ebd6d21e2de82b42f110944.tar.gz linux-stable-7c0577f4e609f7278ebd6d21e2de82b42f110944.tar.bz2 linux-stable-7c0577f4e609f7278ebd6d21e2de82b42f110944.zip | |
Merge tag 'v5.7-rc6' into objtool/core, to pick up fixes and resolve semantic conflict
Resolve structural conflict between:
59566b0b622e: ("x86/ftrace: Have ftrace trampolines turn read-only at the end of system boot up")
which introduced a new reference to 'ftrace_epilogue', and:
0298739b7983: ("x86,ftrace: Fix ftrace_regs_caller() unwind")
Which renamed it to 'ftrace_caller_end'. Rename the new usage site in the merge commit.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index cd352530eca9..a288cd60d2ae 100644 --- a/fs/super.c +++ b/fs/super.c @@ -1302,8 +1302,8 @@ int get_tree_bdev(struct fs_context *fc, mutex_lock(&bdev->bd_fsfreeze_mutex); if (bdev->bd_fsfreeze_count > 0) { mutex_unlock(&bdev->bd_fsfreeze_mutex); - blkdev_put(bdev, mode); warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev); + blkdev_put(bdev, mode); return -EBUSY; } |