]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
proc: rename struct proc_fs_info to proc_fs_opts
authorAlexey Gladkov <gladkov.alexey@gmail.com>
Sun, 19 Apr 2020 14:10:51 +0000 (16:10 +0200)
committerEric W. Biederman <ebiederm@xmission.com>
Wed, 22 Apr 2020 15:51:21 +0000 (10:51 -0500)
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
Reviewed-by: Alexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
fs/proc_namespace.c

index 273ee82d8aa97d8f83bfbfc986f1e8b1c65d640a..9a8b624bc3db569e1f878f3b28bab1820697bcfe 100644 (file)
@@ -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);
        }