Merge tag 'drm-intel-next-fixes-2020-02-13' of git://anongit.freedesktop.org/drm...

[linux.git] / net / netfilter / xt_recent.c

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index 781e0b48218967741e3d92d0ec3514be0485cb25..0a9708004e205cf52f391f1b1729b06504eba207 100644 (file)
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -103,7 +103,7 @@ static DEFINE_SPINLOCK(recent_lock);
 static DEFINE_MUTEX(recent_mutex);
 
 #ifdef CONFIG_PROC_FS
-static const struct file_operations recent_mt_fops;
+static const struct proc_ops recent_mt_proc_ops;
 #endif
 
 static u_int32_t hash_rnd __read_mostly;
@@ -405,7 +405,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
                goto out;
        }
        pde = proc_create_data(t->name, ip_list_perms, recent_net->xt_recent,
-                 &recent_mt_fops, t);
+                              &recent_mt_proc_ops, t);
        if (pde == NULL) {
                recent_table_free(t);
                ret = -ENOMEM;
@@ -616,13 +616,12 @@ recent_mt_proc_write(struct file *file, const char __user *input,
        return size + 1;
 }
 
-static const struct file_operations recent_mt_fops = {
-       .open    = recent_seq_open,
-       .read    = seq_read,
-       .write   = recent_mt_proc_write,
-       .release = seq_release_private,
-       .owner   = THIS_MODULE,
-       .llseek = seq_lseek,
+static const struct proc_ops recent_mt_proc_ops = {
+       .proc_open      = recent_seq_open,
+       .proc_read      = seq_read,
+       .proc_write     = recent_mt_proc_write,
+       .proc_release   = seq_release_private,
+       .proc_lseek     = seq_lseek,
 };
 
 static int __net_init recent_proc_net_init(struct net *net)