Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2682282ybz; Sun, 19 Apr 2020 07:13:04 -0700 (PDT) X-Google-Smtp-Source: APiQypKs6jgeXl/VXi7WOq9AoZ3NpSbKOoerTdkKoMerNH89ShVolD19O2ufUENH4fL/KKJLnFp0 X-Received: by 2002:a17:906:6d95:: with SMTP id h21mr11849826ejt.66.1587305584212; Sun, 19 Apr 2020 07:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587305584; cv=none; d=google.com; s=arc-20160816; b=djsy+Vvf9eK3/JoWlbRhW7HQpDPSUswrMZF74ldquHXitAQdVkxPnyRU7T8wtsFQUX my00EwuDqw5bLu55ST16sylsuJJCp6trpQ/73sgo0sGnQXeKcMw/Z+SIGlKu4Hkb6qCc 6fds176M+UraSRM50oggnJaDr8KD6UxZm8GLKMhQQfBPksKjIBZm/NorZFqTIU3cJwt3 uFxTjEFgPUQyy0l9lg7o1Dt1i/bdbd2JknE4uDBoFkjpwHixemxG/jnT4vBFerC0NT+X encz4PRfLNfH1hAMtiyqunrNqw7LszHCxaV95WIsJFK4nA+/mGzcPO+jIfDuqeYl133X DiLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=lmze/EfIEl1bAmi/N9hOm/d/+qqkwNIXkkL7T3eKEdY=; b=ElopPput4XQLxyMorci7zz1KKhlTP/rd/Mbmw4mXQVNErshYN6SMCu3/IyUA9P9Jv9 yveQ5w6UvAYIcMoTifqnabZaG67SRYRawKKZBKkZShoTcJVsNCqKWHhvtrIlMOgrXcc9 /SDJuCdhD2prqQSTWAjjJ8Q3FchoOoQ7+K71Q8Kphu93AV2/oLhSLHWeVVgYz83rbW2D kY+4OeHnQ5N3P53yN83xyf7VWIEpdQXrBiZOAdNs9zlyCJfH0UkFT4ZSPD65RB+TktdW 74TQ2FcwJh1Hc7uMrL2EcKsuN8StRXHiqqZSBaoU6zyk5ICdml55saQ0rRQU3rBuY5/F YPjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o13si18382086edz.352.2020.04.19.07.12.41; Sun, 19 Apr 2020 07:13:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726117AbgDSOLn (ORCPT + 99 others); Sun, 19 Apr 2020 10:11:43 -0400 Received: from raptor.unsafe.ru ([5.9.43.93]:45414 "EHLO raptor.unsafe.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725905AbgDSOLm (ORCPT ); Sun, 19 Apr 2020 10:11:42 -0400 Received: from comp-core-i7-2640m-0182e6.redhat.com (ip-89-102-33-211.net.upcbroadband.cz [89.102.33.211]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by raptor.unsafe.ru (Postfix) with ESMTPSA id BFC74209FB; Sun, 19 Apr 2020 14:11:39 +0000 (UTC) From: Alexey Gladkov To: LKML Cc: Kernel Hardening , Linux API , Linux FS Devel , Linux Security Module , Akinobu Mita , Alexander Viro , Alexey Dobriyan , Alexey Gladkov , Andrew Morton , Andy Lutomirski , Daniel Micay , Djalal Harouni , "Dmitry V . Levin" , "Eric W . Biederman" , Greg Kroah-Hartman , Ingo Molnar , "J . Bruce Fields" , Jeff Layton , Jonathan Corbet , Kees Cook , Linus Torvalds , Oleg Nesterov , David Howells Subject: [PATCH v12 1/7] proc: rename struct proc_fs_info to proc_fs_opts Date: Sun, 19 Apr 2020 16:10:51 +0200 Message-Id: <20200419141057.621356-2-gladkov.alexey@gmail.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200419141057.621356-1-gladkov.alexey@gmail.com> References: <20200419141057.621356-1-gladkov.alexey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.1 (raptor.unsafe.ru [5.9.43.93]); Sun, 19 Apr 2020 14:11:40 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Alexey Gladkov Reviewed-by: Alexey Dobriyan Reviewed-by: Kees Cook --- fs/proc_namespace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 273ee82d8aa9..9a8b624bc3db 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -37,23 +37,23 @@ static __poll_t mounts_poll(struct file *file, poll_table *wait) return res; } -struct proc_fs_info { +struct proc_fs_opts { int flag; const char *str; }; static int show_sb_opts(struct seq_file *m, struct super_block *sb) { - static const struct proc_fs_info fs_info[] = { + static const struct proc_fs_opts fs_opts[] = { { SB_SYNCHRONOUS, ",sync" }, { SB_DIRSYNC, ",dirsync" }, { SB_MANDLOCK, ",mand" }, { SB_LAZYTIME, ",lazytime" }, { 0, NULL } }; - const struct proc_fs_info *fs_infop; + const struct proc_fs_opts *fs_infop; - for (fs_infop = fs_info; fs_infop->flag; fs_infop++) { + for (fs_infop = fs_opts; fs_infop->flag; fs_infop++) { if (sb->s_flags & fs_infop->flag) seq_puts(m, fs_infop->str); } @@ -63,7 +63,7 @@ static int show_sb_opts(struct seq_file *m, struct super_block *sb) static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt) { - static const struct proc_fs_info mnt_info[] = { + static const struct proc_fs_opts mnt_opts[] = { { MNT_NOSUID, ",nosuid" }, { MNT_NODEV, ",nodev" }, { MNT_NOEXEC, ",noexec" }, @@ -72,9 +72,9 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt) { MNT_RELATIME, ",relatime" }, { 0, NULL } }; - const struct proc_fs_info *fs_infop; + const struct proc_fs_opts *fs_infop; - for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) { + for (fs_infop = mnt_opts; fs_infop->flag; fs_infop++) { if (mnt->mnt_flags & fs_infop->flag) seq_puts(m, fs_infop->str); } -- 2.25.3