[RH7,01/32] Revert "proc: add a proc_show_path method to fix mountinfo"

Submitted by Pavel Tikhomirov on June 8, 2020, 5:05 p.m.

Details

Message ID 20200608170602.308872-2-ptikhomirov@virtuozzo.com
State New
Series "port nsfs from vz8"
Headers show

Commit Message

Pavel Tikhomirov June 8, 2020, 5:05 p.m.
This reverts commit 8782a0069f1b31dc9550e98e351a43eb20b9887a.

We switch from procfs ns-files to nsfs ones, so we will apply nsfs
version of the patch instead.

https://jira.sw.ru/browse/PSBM-102357

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 fs/proc/inode.c | 17 -----------------
 1 file changed, 17 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 0fff949bcc13..4eef2b46b87e 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -23,7 +23,6 @@ 
 #include <linux/slab.h>
 #include <linux/mount.h>
 #include <linux/magic.h>
-#include <linux/proc_ns.h>
 
 #include <asm/uaccess.h>
 
@@ -125,21 +124,6 @@  static int proc_show_options(struct seq_file *seq, struct dentry *root)
 	return 0;
 }
 
-static int proc_show_path(struct seq_file *seq, struct dentry *dentry)
-{
-	struct inode *inode = d_inode(dentry);
-	struct proc_ns *ei;
-
-	if (proc_ns_inode(inode)) {
-		ei = get_proc_ns(inode);
-		seq_printf(seq, "%s:[%lu]", ei->ns_ops->name, inode->i_ino);
-		return 0;
-	}
-
-	seq_dentry(seq, dentry, " \t\n\\");
-	return 0;
-}
-
 static const struct super_operations proc_sops = {
 	.alloc_inode	= proc_alloc_inode,
 	.destroy_inode	= proc_destroy_inode,
@@ -148,7 +132,6 @@  static const struct super_operations proc_sops = {
 	.statfs		= simple_statfs,
 	.remount_fs	= proc_remount,
 	.show_options	= proc_show_options,
-	.show_path	= proc_show_path,
 };
 
 enum {BIAS = -1U<<31};