Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f50752ea authored by Al Viro's avatar Al Viro
Browse files

switch all procfs directories ->iterate_shared() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 76aab3ab

fs/proc/base.c

+10 −10
Original line number Diff line number Diff line
@@ -2159,8 +2159,8 @@ proc_map_files_readdir(struct file *file, struct dir_context *ctx) 


static const struct file_operations proc_map_files_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_map_files_readdir,

	.llseek		= default_llseek,

	.iterate_shared	= proc_map_files_readdir,

	.llseek		= generic_file_llseek,

};



#ifdef CONFIG_CHECKPOINT_RESTORE
@@ -2507,8 +2507,8 @@ static int proc_attr_dir_readdir(struct file *file, struct dir_context *ctx) 


static const struct file_operations proc_attr_dir_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_attr_dir_readdir,

	.llseek		= default_llseek,

	.iterate_shared	= proc_attr_dir_readdir,

	.llseek		= generic_file_llseek,

};



static struct dentry *proc_attr_dir_lookup(struct inode *dir,
@@ -2915,8 +2915,8 @@ static int proc_tgid_base_readdir(struct file *file, struct dir_context *ctx) 


static const struct file_operations proc_tgid_base_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_tgid_base_readdir,

	.llseek		= default_llseek,

	.iterate_shared	= proc_tgid_base_readdir,

	.llseek		= generic_file_llseek,

};



static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
@@ -3263,8 +3263,8 @@ static struct dentry *proc_tid_base_lookup(struct inode *dir, struct dentry *den 


static const struct file_operations proc_tid_base_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_tid_base_readdir,

	.llseek		= default_llseek,

	.iterate_shared	= proc_tid_base_readdir,

	.llseek		= generic_file_llseek,

};



static const struct inode_operations proc_tid_base_inode_operations = {
@@ -3474,6 +3474,6 @@ static const struct inode_operations proc_task_inode_operations = { 


static const struct file_operations proc_task_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_task_readdir,

	.llseek		= default_llseek,

	.iterate_shared	= proc_task_readdir,

	.llseek		= generic_file_llseek,

};

fs/proc/fd.c

+4 −4
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ static int proc_readfd(struct file *file, struct dir_context *ctx) 


const struct file_operations proc_fd_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_readfd,

	.llseek		= default_llseek,

	.iterate_shared	= proc_readfd,

	.llseek		= generic_file_llseek,

};



static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
@@ -361,6 +361,6 @@ const struct inode_operations proc_fdinfo_inode_operations = { 


const struct file_operations proc_fdinfo_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_readfdinfo,

	.llseek		= default_llseek,

	.iterate_shared	= proc_readfdinfo,

	.llseek		= generic_file_llseek,

};

fs/proc/generic.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ int proc_readdir(struct file *file, struct dir_context *ctx) 
static const struct file_operations proc_dir_operations = {

	.llseek			= generic_file_llseek,

	.read			= generic_read_dir,

	.iterate		= proc_readdir,

	.iterate_shared		= proc_readdir,

};



/*

fs/proc/namespaces.c

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ static int proc_ns_dir_readdir(struct file *file, struct dir_context *ctx) 


const struct file_operations proc_ns_dir_operations = {

	.read		= generic_read_dir,

	.iterate	= proc_ns_dir_readdir,

	.iterate_shared	= proc_ns_dir_readdir,

	.llseek		= generic_file_llseek,

};



static struct dentry *proc_ns_dir_lookup(struct inode *dir,

fs/proc/proc_net.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int proc_tgid_net_readdir(struct file *file, struct dir_context *ctx) 
const struct file_operations proc_net_operations = {

	.llseek		= generic_file_llseek,

	.read		= generic_read_dir,

	.iterate	= proc_tgid_net_readdir,

	.iterate_shared	= proc_tgid_net_readdir,

};



static __net_init int proc_net_ns_init(struct net *net)