From patchwork Wed May 31 12:55:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 101446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2867673vqr; Wed, 31 May 2023 06:10:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7hGPmWpKbXSXA3UfcT4eq5EWYfq2mWYYTqVfZSFO9ga3kwzPy+WyS98mz4yMVAz+TaQITt X-Received: by 2002:a05:6a20:a41a:b0:10b:ce6e:656b with SMTP id z26-20020a056a20a41a00b0010bce6e656bmr3810822pzk.46.1685538633120; Wed, 31 May 2023 06:10:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685538633; cv=none; d=google.com; s=arc-20160816; b=ahAXeFluOmJQ8ydnlO/Z4Ij/PLRavns+eNuZDDJOG6JNIkLIEJ175OC6mJyiTK9dA8 is4HeFygorit8dpM9e00yclIZ0uNBVeVna2Q57YoxrvKGhku4nGGJ3JXz88LIY62acrR lJL1ccT65BYHOoj/IzZ85ILpj5humbmxlWmKZfoymApH1dI157MVNpPXAQ83YTSdShTb iYluZUhyVK5C8TA2WzBe23Ynyz+HjuO1LQwXPTgE6VV+N5WtYysbnSzu7CucSQqCwMAv syzljlXrJ3c6uCaOYuYkEWlYlmpMb/Ols995qcnGPa29T9YUJIsVp6O95SOXOrJkOEAP aLGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yNfxLrWSKMQ1L/coufSFF/AHaRvjvn5eGandAFcc5MM=; b=BiYM0hbHqbTRJE3kC40vJptHfywhrjO2uHANahvT9CBZ+J62j9tY3kj6dj3HpM/dOC +c8E4MItWJbjDizgYjNz7llh0CH5U7dXV36crERN5SOHOkw69ugl2cXtr2go96lEFIHN 3HkHbZ3RJTgL+6GG3xnxtn+gsAAuxjVAanXC4sIVs6MgzZR8wk4kWQqr5ZAbBTc14VpW pdSndU8L7gWN6mDN8pyd69PTa8CMFx5KkzkW0MybEnx3lXQwMSTs5m0UMuZa5F2ghs/w aNhZYMoqCNL3pi8+QpCYJF0Grc+LZJBg/05dSC8Hd6VzYAk2+VKpOX3ekdB0y1MoEmzw Entw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=HjoU3qoq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 16-20020a630210000000b005303b739292si941200pgc.702.2023.05.31.06.10.19; Wed, 31 May 2023 06:10:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=HjoU3qoq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235827AbjEaM5L (ORCPT + 99 others); Wed, 31 May 2023 08:57:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236175AbjEaM4w (ORCPT ); Wed, 31 May 2023 08:56:52 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23C41186; Wed, 31 May 2023 05:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=yNfxLrWSKMQ1L/coufSFF/AHaRvjvn5eGandAFcc5MM=; b=HjoU3qoq8OAeFYzOy6qCBwVw90 ghE7PrPFy1c3S5fEiEmJxEO03j9a/DlgnPbdt7jZTXu6OfUw66wXuC+tj1TXLma8kci5WgrzAvS9U hrthPCxBh97HX7R/7iuh1LySGzV8ZCU1KtGj0Crd18yqoQq9tPAsXrDfA6gP+vL42absl+WDrZgbG 4wWY6bFzgeR4TjjK72zxJ4A7vOzHWWtye7YTnt0FnPDeVibVxv8Q7kIzgrgRWlNkAHDt1VJFz+TQv IvPBQcYL1BHF/0yfoy+meZ4lG6iYXxEI480Nq438OGDvKJOUVO1RDd4BAp8kGCZdo57OPzZtGAJM7 GtiJGDeg==; Received: from [2001:4bb8:182:6d06:2e49:a56:513a:92ee] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q4LN4-00HR5q-0p; Wed, 31 May 2023 12:56:10 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Mike Snitzer , Joern Engel , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Pavel Machek , Loic Poulain , dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-mtd@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH 06/24] init: rename mount_block_root to mount_root_generic Date: Wed, 31 May 2023 14:55:17 +0200 Message-Id: <20230531125535.676098-7-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531125535.676098-1-hch@lst.de> References: <20230531125535.676098-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767415357424687722?= X-GMAIL-MSGID: =?utf-8?q?1767415357424687722?= mount_block_root is also used to mount non-block file systems, so give it a better name. Signed-off-by: Christoph Hellwig --- init/do_mounts.c | 6 +++--- init/do_mounts.h | 2 +- init/do_mounts_initrd.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index 2fe7901b5bcfaf..a2c0baace0992c 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -391,7 +391,7 @@ static int __init do_mount_root(const char *name, const char *fs, return ret; } -void __init mount_block_root(char *name, int flags) +void __init mount_root_generic(char *name, int flags) { struct page *page = alloc_page(GFP_KERNEL); char *fs_names = page_address(page); @@ -589,7 +589,7 @@ void __init mount_root(void) if (err < 0) pr_emerg("Failed to create /dev/root: %d\n", err); - mount_block_root("/dev/root", root_mountflags); + mount_root_generic("/dev/root", root_mountflags); } #endif } @@ -620,7 +620,7 @@ void __init prepare_namespace(void) root_device_name = saved_root_name; if (!strncmp(root_device_name, "mtd", 3) || !strncmp(root_device_name, "ubi", 3)) { - mount_block_root(root_device_name, root_mountflags); + mount_root_generic(root_device_name, root_mountflags); goto out; } ROOT_DEV = name_to_dev_t(root_device_name); diff --git a/init/do_mounts.h b/init/do_mounts.h index 7a29ac3e427bab..33623025f6951a 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -10,7 +10,7 @@ #include #include -void mount_block_root(char *name, int flags); +void mount_root_generic(char *name, int flags); void mount_root(void); extern int root_mountflags; diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 34731241377d30..686d1ff3af4bb1 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -95,7 +95,7 @@ static void __init handle_initrd(void) real_root_dev = new_encode_dev(ROOT_DEV); create_dev("/dev/root.old", Root_RAM0); /* mount initrd on rootfs' /root */ - mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY); + mount_root_generic("/dev/root.old", root_mountflags & ~MS_RDONLY); init_mkdir("/old", 0700); init_chdir("/old");