From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission.com>,
Chuck Lever <chuck.lever@oracle.com>
Cc: NeilBrown <neilb@suse.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the userns tree
Date: Fri, 17 Dec 2021 18:13:25 +1100 [thread overview]
Message-ID: <20211217181325.4fa394c4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2100 bytes --]
Hi all,
After merging the userns tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/lockd/svc.c: In function 'lockd':
fs/lockd/svc.c:188:2: error: implicit declaration of function 'module_put_and_exit'; did you mean 'module_put_and_kthread_exit'? [-Werror=implicit-function-declaration]
188 | module_put_and_exit(0);
| ^~~~~~~~~~~~~~~~~~~
| module_put_and_kthread_exit
fs/lockd/svc.c:189:1: error: no return statement in function returning non-void [-Werror=return-type]
189 | }
| ^
Caused by commit
ca3574bd653a ("exit: Rename module_put_and_exit to module_put_and_kthread_exit")
interacting with commit
6b044fbaab02 ("lockd: use svc_set_num_threads() for thread start and stop")
from the cel tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Dec 2021 18:10:42 +1100
Subject: [PATCH] fix up for "lockd: use svc_set_num_threads() for thread start
and stop"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/lockd/svc.c | 2 +-
include/linux/sunrpc/svc.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 4defefd89cbf..0475c5a5d061 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -185,7 +185,7 @@ lockd(void *vrqstp)
svc_exit_thread(rqstp);
- module_put_and_exit(0);
+ module_put_and_kthread_exit(0);
}
static int create_lockd_listener(struct svc_serv *serv, const char *name,
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index cf175d47c6b7..f35c22b3355f 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -65,7 +65,7 @@ struct svc_serv_ops {
void (*svo_enqueue_xprt)(struct svc_xprt *);
/* optional module to count when adding threads.
- * Thread function must call module_put_and_exit() to exit.
+ * Thread function must call module_put_and_kthread_exit() to exit.
*/
struct module *svo_module;
};
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-12-17 7:13 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 7:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-16 5:56 linux-next: build failure after merge of the userns tree Stephen Rothwell
2022-03-16 13:54 ` Eric W. Biederman
2021-12-17 7:34 Stephen Rothwell
2021-12-17 16:53 ` Eric W. Biederman
2021-10-20 3:46 Stephen Rothwell
2021-10-20 16:00 ` Eric W. Biederman
2021-10-07 3:47 Stephen Rothwell
2021-10-07 18:56 ` Eric W. Biederman
2020-05-21 8:22 Stephen Rothwell
2018-03-28 7:41 Stephen Rothwell
2018-03-28 18:32 ` Eric W. Biederman
2018-01-26 1:05 Stephen Rothwell
2018-01-26 2:45 ` Eric W. Biederman
2017-07-20 3:25 Stephen Rothwell
2017-07-20 12:17 ` Eric W. Biederman
2015-05-25 10:39 Stephen Rothwell
2014-04-17 5:12 Stephen Rothwell
2014-04-17 7:18 ` Eric W. Biederman
2014-04-22 1:34 ` Stephen Rothwell
2013-11-08 7:07 Stephen Rothwell
2013-11-08 23:15 ` Eric W. Biederman
2013-11-11 5:25 ` Stephen Rothwell
2013-11-08 6:58 Stephen Rothwell
2013-11-08 7:27 ` Christoph Hellwig
2013-11-08 15:55 ` Al Viro
2013-11-08 22:50 ` Eric W. Biederman
2013-11-09 8:32 ` Christoph Hellwig
2012-09-24 12:18 Stephen Rothwell
2012-05-21 7:50 Stephen Rothwell
2012-05-21 22:05 ` Eric W. Biederman
2012-05-14 9:13 Stephen Rothwell
2012-05-16 1:12 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211217181325.4fa394c4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chuck.lever@oracle.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).