procfs: new helper - PDE_DATA(inode)

[mirror_ubuntu-bionic-kernel.git] / net / netfilter / xt_recent.c

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index 978efc9b555a3e1936cb5e49c0537055e3b642f9..3db2d387cf52af6faf776ac8385f088fee30e2b2 100644 (file)
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -525,14 +525,13 @@ static const struct seq_operations recent_seq_ops = {
 
 static int recent_seq_open(struct inode *inode, struct file *file)
 {
-       struct proc_dir_entry *pde = PDE(inode);
        struct recent_iter_state *st;
 
        st = __seq_open_private(file, &recent_seq_ops, sizeof(*st));
        if (st == NULL)
                return -ENOMEM;
 
-       st->table    = pde->data;
+       st->table    = PDE_DATA(inode);
        return 0;
 }
 
@@ -540,8 +539,7 @@ static ssize_t
 recent_mt_proc_write(struct file *file, const char __user *input,
                     size_t size, loff_t *loff)
 {
-       const struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
-       struct recent_table *t = pde->data;
+       struct recent_table *t = PDE_DATA(file_inode(file));
        struct recent_entry *e;
        char buf[sizeof("+b335:1d35:1e55:dead:c0de:1715:5afe:c0de")];
        const char *c = buf;
@@ -643,7 +641,7 @@ static void __net_exit recent_proc_net_exit(struct net *net)
        recent_net->xt_recent = NULL;
        spin_unlock_bh(&recent_lock);
 
-       proc_net_remove(net, "xt_recent");
+       remove_proc_entry("xt_recent", net->proc_net);
 }
 #else
 static inline int recent_proc_net_init(struct net *net)