switch all procfs directories ->iterate_shared()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 15b60f1a346def8edc7fac4f13962b3ab13968f5..beb45d47bf77ae9aa7203235513d93f88f6295f2 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2159,8 +2159,8 @@ out:
 
 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,
 };

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 56afa5ef08f2dbca5f36f5feafa2a257bf525ab3..01df23cc81f62d4a6d1c3aadcb1b48495b0d7917 100644 (file)
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -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,
 };

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index ff3ffc76a93795b6662cb80d85f2a404d8f20693..c633476616e0fe7be920d9421f8eba627a4398b3 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -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,
 };
 
 /*

diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 72cb26f85d58dce643936b7c447cb9b56b9bd7d3..51b8b0a8ad91b27d569d65c50e61d8d14aecab83 100644 (file)
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -139,7 +139,8 @@ out:
 
 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,

diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 350984a19c83440e09b6b1dafd87dc150dd078da..c8bbc68cdb05923cec13752d7b575c76fdd7895c 100644 (file)
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -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)

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index d69e2385862c2454cae96c525df6db67a3bfa2f2..5e57c3e46e1da6d2338cdce05ec0044d5b158797 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -790,7 +790,7 @@ static const struct file_operations proc_sys_file_operations = {
 
 static const struct file_operations proc_sys_dir_file_operations = {
        .read           = generic_read_dir,
-       .iterate        = proc_sys_readdir,
+       .iterate_shared = proc_sys_readdir,
        .llseek         = generic_file_llseek,
 };
 

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 361ab4ee42fc3632232f4bc6eaef54a12f6b47e6..55bc7d6c8aacaed2f4892bd1a554e3baf939bf34 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -226,8 +226,8 @@ static int proc_root_readdir(struct file *file, struct dir_context *ctx)
  */
 static const struct file_operations proc_root_operations = {
        .read            = generic_read_dir,
-       .iterate         = proc_root_readdir,
-       .llseek         = default_llseek,
+       .iterate_shared  = proc_root_readdir,
+       .llseek         = generic_file_llseek,
 };
 
 /*