diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-16 16:07:31 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 08:56:32 (GMT) |
| commit | f0c3b5093addc8bfe9fe3a5b01acb7ec7969eafa (patch) | |
| tree | 3bad119186fd14fa95886cfc73c6953a4dd00e74 /fs/proc/proc_net.c | |
| parent | 68c61471138402e34489edc5efde4f0fc5beaa25 (diff) | |
| download | linux-f0c3b5093addc8bfe9fe3a5b01acb7ec7969eafa.tar.xz | |
[readdir] convert procfs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc/proc_net.c')
| -rw-r--r-- | fs/proc/proc_net.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index 986e832..4677bb7 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -160,16 +160,15 @@ const struct inode_operations proc_net_inode_operations = { .getattr = proc_tgid_net_getattr, }; -static int proc_tgid_net_readdir(struct file *filp, void *dirent, - filldir_t filldir) +static int proc_tgid_net_readdir(struct file *file, struct dir_context *ctx) { int ret; struct net *net; ret = -EINVAL; - net = get_proc_task_net(file_inode(filp)); + net = get_proc_task_net(file_inode(file)); if (net != NULL) { - ret = proc_readdir_de(net->proc_net, filp, dirent, filldir); + ret = proc_readdir_de(net->proc_net, file, ctx); put_net(net); } return ret; @@ -178,7 +177,7 @@ static int proc_tgid_net_readdir(struct file *filp, void *dirent, const struct file_operations proc_net_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, - .readdir = proc_tgid_net_readdir, + .iterate = proc_tgid_net_readdir, }; static __net_init int proc_net_ns_init(struct net *net) |