There's no point in having this eyesore in the middle of vfs_coredump(). Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx> --- fs/coredump.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/coredump.c b/fs/coredump.c index 081b5e9d16e2..cddc1f7bfcab 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -1024,6 +1024,15 @@ static bool coredump_pipe(struct core_name *cn, struct coredump_params *cprm, return false; } + /* + * umh disabled with CONFIG_STATIC_USERMODEHELPER_PATH="" would + * have this set to NULL. + */ + if (!cprm->file) { + coredump_report_failure("Core dump to |%s disabled", cn->corename); + return false; + } + return true; } @@ -1117,14 +1126,6 @@ void vfs_coredump(const kernel_siginfo_t *siginfo) goto close_fail; if ((cn.mask & COREDUMP_KERNEL) && !dump_interrupted()) { - /* - * umh disabled with CONFIG_STATIC_USERMODEHELPER_PATH="" would - * have this set to NULL. - */ - if (!cprm.file) { - coredump_report_failure("Core dump to |%s disabled", cn.corename); - goto close_fail; - } if (!dump_vma_snapshot(&cprm)) goto close_fail; -- 2.47.2