Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104881
b: refs/heads/master
c: 8086cd4
h: refs/heads/master
i:
  104879: 23ed21b
v: v3
  • Loading branch information
Adrian Bunk authored and David S. Miller committed Jul 22, 2008
1 parent e48e12a commit 6609181
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea
refs/heads/master: 8086cd451f08f4c0f9693fc66d87754bbd18cfba
11 changes: 5 additions & 6 deletions trunk/fs/proc/proc_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
#include "internal.h"


static struct net *get_proc_net(const struct inode *inode)
{
return maybe_get_net(PDE_NET(PDE(inode)));
}

int seq_open_net(struct inode *ino, struct file *f,
const struct seq_operations *ops, int size)
{
Expand Down Expand Up @@ -185,12 +190,6 @@ void proc_net_remove(struct net *net, const char *name)
}
EXPORT_SYMBOL_GPL(proc_net_remove);

struct net *get_proc_net(const struct inode *inode)
{
return maybe_get_net(PDE_NET(PDE(inode)));
}
EXPORT_SYMBOL_GPL(get_proc_net);

static __net_init int proc_net_ns_init(struct net *net)
{
struct proc_dir_entry *netd, *net_statd;
Expand Down
2 changes: 0 additions & 2 deletions trunk/include/linux/proc_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,6 @@ static inline struct net *PDE_NET(struct proc_dir_entry *pde)
return pde->parent->data;
}

struct net *get_proc_net(const struct inode *inode);

struct proc_maps_private {
struct pid *pid;
struct task_struct *task;
Expand Down

0 comments on commit 6609181

Please sign in to comment.