LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Paulo Alcantara (SUSE)" <paulo@paulo.ac>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	linux-cifs@vger.kernel.org, samba-technical@lists.samba.org
Cc: "Paulo Alcantara (SUSE)" <paulo@paulo.ac>,
	"David S. Miller" <davem@davemloft.net>,
	Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
	Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Subject: [PATCH 3/3] ipconfig: Handle CONFIG_CIFS_ROOT option
Date: Tue, 16 Jul 2019 19:04:52 -0300	[thread overview]
Message-ID: <20190716220452.3382-3-paulo@paulo.ac> (raw)
In-Reply-To: <20190716220452.3382-1-paulo@paulo.ac>

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.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: Paulo Alcantara (SUSE) <paulo@paulo.ac>
---
 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.22.0


  parent reply	other threads:[~2019-07-16 22:11 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-16 22:04 [PATCH 1/3] cifs: Add support for root file systems Paulo Alcantara (SUSE)
2019-07-16 22:04 ` [PATCH 2/3] init: Support mounting root file systems over SMB Paulo Alcantara (SUSE)
2019-07-16 22:04 ` Paulo Alcantara (SUSE) [this message]
2019-09-19 15:21 ` [PATCH v2 1/3] cifs: Add support for root file systems Paulo Alcantara (SUSE)
2019-09-19 15:21   ` [PATCH v2 2/3] init: Support mounting root file systems over SMB Paulo Alcantara (SUSE)
2019-09-19 15:21   ` [PATCH v2 3/3] ipconfig: Handle CONFIG_CIFS_ROOT option Paulo Alcantara (SUSE)
2019-09-20 10:04   ` [PATCH v2 1/3] cifs: Add support for root file systems Paulo Alcantara
2019-09-23  8:53   ` David Miller

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=20190716220452.3382-3-paulo@paulo.ac \
    --to=paulo@paulo.ac \
    --cc=davem@davemloft.net \
    --cc=kuznet@ms2.inr.ac.ru \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=samba-technical@lists.samba.org \
    --cc=yoshfuji@linux-ipv6.org \
    --subject='Re: [PATCH 3/3] ipconfig: Handle CONFIG_CIFS_ROOT option' \
    /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

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).