From: "Paulo Alcantara (SUSE)" <pc@cjr.nz>
To: netdev@vger.kernel.org, linux-cifs@vger.kernel.org,
samba-technical@lists.samba.org, davem@davemloft.net,
smfrench@gmail.com
Cc: "Paulo Alcantara (SUSE)" <pc@cjr.nz>
Subject: [PATCH net-next 2/2] ipconfig: Handle CONFIG_CIFS_ROOT option
Date: Tue, 1 Oct 2019 14:10:28 -0300 [thread overview]
Message-ID: <20191001171028.23356-3-pc@cjr.nz> (raw)
In-Reply-To: <20191001171028.23356-1-pc@cjr.nz>
The experimental root file system support in cifs.ko relies on
ipconfig to set up the network stack and then accessing the SMB share
that contains the rootfs files.
Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
---
net/ipv4/ipconfig.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 9bcca08efec9..32e20b758b68 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1483,10 +1483,10 @@ static int __init ip_auto_config(void)
* missing values.
*/
if (ic_myaddr == NONE ||
-#ifdef CONFIG_ROOT_NFS
+#if defined(CONFIG_ROOT_NFS) || defined(CONFIG_CIFS_ROOT)
(root_server_addr == NONE &&
ic_servaddr == NONE &&
- ROOT_DEV == Root_NFS) ||
+ (ROOT_DEV == Root_NFS || ROOT_DEV == Root_CIFS)) ||
#endif
ic_first_dev->next) {
#ifdef IPCONFIG_DYNAMIC
@@ -1513,6 +1513,12 @@ static int __init ip_auto_config(void)
goto try_try_again;
}
#endif
+#ifdef CONFIG_CIFS_ROOT
+ if (ROOT_DEV == Root_CIFS) {
+ pr_err("IP-Config: Retrying forever (CIFS root)...\n");
+ goto try_try_again;
+ }
+#endif
if (--retries) {
pr_err("IP-Config: Reopening network devices...\n");
--
2.23.0
next prev parent reply other threads:[~2019-10-01 17:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 17:10 [PATCH net-next 0/2] Experimental SMB rootfs support Paulo Alcantara (SUSE)
2019-10-01 17:10 ` [PATCH net-next 1/2] init: Support mounting root file systems over SMB Paulo Alcantara (SUSE)
2019-10-01 17:10 ` Paulo Alcantara (SUSE) [this message]
2019-10-02 16:15 ` [PATCH net-next 0/2] Experimental SMB rootfs support David Miller
2019-11-27 4:57 ` Fwd: " Steve French
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=20191001171028.23356-3-pc@cjr.nz \
--to=pc@cjr.nz \
--cc=davem@davemloft.net \
--cc=linux-cifs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=samba-technical@lists.samba.org \
--cc=smfrench@gmail.com \
/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).