Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1608104ybb; Thu, 9 Apr 2020 05:42:26 -0700 (PDT) X-Google-Smtp-Source: APiQypJr5r5RXh6YbtOIZ3TAH4gX3ESrq8K6WDLuOreN2LIA2Y2XkRRZNzAS299AyO9eQWGOMUYE X-Received: by 2002:a0c:e153:: with SMTP id c19mr6504335qvl.115.1586436146452; Thu, 09 Apr 2020 05:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586436146; cv=none; d=google.com; s=arc-20160816; b=1GQMQgW7pcRtRreLQ+RSb8Q5EugfgcS4NKh5mNiNGpAbcw768GfIkmnNLDC4/3gOFm +46qlJ4e1TPcz4nE0MYJlJJ56tpRjAJF0PSsb2dpBnmhxOxttJNaQYxvM93nTrDtf1Qd BT+4JSJ9dTcE1JmF+EUMSb7FAg8Ha2TCEwPxXYkmFqq/ZLrQKAzEq2rsg3i+tPbmdodr X4ZNMJ1lkE4i33xEUHOiVjjrJ+wfHVlrFaLikeVvo7T32jzpyEZbMigRDENSDUlooQqL VcmuptPuBBlvWLakBJM5DnjyY4L++BAOFeRTXNJF/pGcdUk0DcU06J4e17G5ad82Jyan OfKg== 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=Ojp9x6ldBPQ0hZUw4H2WuF42Qfv0hFToMUOE3hhJBrs=; b=VjRtc5G31DQ7NzHz+wsEXvJSgj5RlHon5EH4s51Ungynkq7Sy1V8Wlopxq1EJLpQn6 kzMBwIX7vk1080GsZuZHTuSrO+HrXZ1iomgLwraPNQGJCTbupBsHk+zGO0CSgVSfBtfx Rw35qP7HahUqMBgqk6irIHWdBiiBVKM2iR58XsqCwX6DAxP2lTk+CfLdUJ3OUKEuU7tA o2bTQWLRXYoaZucM1y5CCfO4MhFv1ZAKhBotwSAm40OFhCoMOYkFwHRJjD7x81BG/tc1 cW/LtToxkqYkv4ImZi62Td0kKN0p2H8BIs10VUfyPVDRI2lQytoGXeXylkbQgg9Bw/Wl RJIQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id d6si5380812qtq.379.2020.04.09.05.42.10; Thu, 09 Apr 2020 05:42:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726654AbgDIMio (ORCPT + 99 others); Thu, 9 Apr 2020 08:38:44 -0400 Received: from raptor.unsafe.ru ([5.9.43.93]:58474 "EHLO raptor.unsafe.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725987AbgDIMio (ORCPT ); Thu, 9 Apr 2020 08:38:44 -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 4250F209D4; Thu, 9 Apr 2020 12:38:41 +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 RESEND v11 1/8] proc: rename struct proc_fs_info to proc_fs_opts Date: Thu, 9 Apr 2020 14:37:45 +0200 Message-Id: <20200409123752.1070597-2-gladkov.alexey@gmail.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200409123752.1070597-1-gladkov.alexey@gmail.com> References: <20200409123752.1070597-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]); Thu, 09 Apr 2020 12:38:42 +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.2