From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] devtmpfs: factor out setup part of devtmpfsd()
Date: Wed, 15 Jan 2020 19:41:50 +0100 [thread overview]
Message-ID: <20200115184154.3492-3-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <20200115184154.3492-1-linux@rasmusvillemoes.dk>
Factor out the setup part of devtmpfsd() to make it a bit easier to
see that we always call setup_done() exactly once (provided of course
the kthread is succesfully created).
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
drivers/base/devtmpfs.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index ccb046fe12b7..963889331bb4 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -388,7 +388,7 @@ static int handle(const char *name, umode_t mode, kuid_t uid, kgid_t gid,
return handle_remove(name, dev);
}
-static int devtmpfsd(void *p)
+static int devtmpfs_setup(void *p)
{
int err;
@@ -400,7 +400,18 @@ static int devtmpfsd(void *p)
goto out;
ksys_chdir("/.."); /* will traverse into overmounted root */
ksys_chroot(".");
+out:
+ *(int *)p = err;
complete(&setup_done);
+ return err;
+}
+
+static int devtmpfsd(void *p)
+{
+ int err = devtmpfs_setup(p);
+
+ if (err)
+ return err;
while (1) {
spin_lock(&req_lock);
while (requests) {
@@ -421,10 +432,6 @@ static int devtmpfsd(void *p)
schedule();
}
return 0;
-out:
- *(int *)p = err;
- complete(&setup_done);
- return err;
}
/*
--
2.23.0
next prev parent reply other threads:[~2020-01-15 18:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 18:41 [PATCH 0/5] a few devtmpfs patches Rasmus Villemoes
2020-01-15 18:41 ` [PATCH 1/5] devtmpfs: fix theoretical stale pointer deref in devtmpfsd() Rasmus Villemoes
2020-01-15 18:41 ` Rasmus Villemoes [this message]
2020-01-15 18:41 ` [PATCH 3/5] devtmpfs: simplify initialization of mount_dev Rasmus Villemoes
2020-01-15 18:41 ` [PATCH 4/5] devtmpfs: initify a bit Rasmus Villemoes
2020-01-15 18:41 ` [PATCH 5/5] devtmpfs: factor out common tail of devtmpfs_{create,delete}_node Rasmus Villemoes
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=20200115184154.3492-3-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
/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
all inboxes | Powered by JetHome®