aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2020-02-08 16:05:35 +0100
committerJoonas Kylmälä <joonas.kylmala@iki.fi>2020-07-09 14:59:38 -0400
commit768796ed115656ffad2f96a7b25b212a10fda905 (patch)
tree6b8f419e5d4fa26b5e2eaf734d8a6a8584084722
parent2a40a54ca8887b48e35a95a6d8a31e1466d3d951 (diff)
downloadkernel_replicant_linux-history/replicant-10/before-5.8rc6.tar.gz
kernel_replicant_linux-history/replicant-10/before-5.8rc6.tar.bz2
kernel_replicant_linux-history/replicant-10/before-5.8rc6.zip
ANDROID: fix up xt_quota2 for proc_ops changeshistory/replicant-10/before-5.8rc6
proc now uses proc_ops, not file_operations, so fix it up to handle the 5.6-rc1 merge. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I80b5ca4448bffa3a0c5cc99a964b7e8aba2450c0
-rw-r--r--net/netfilter/xt_quota2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/xt_quota2.c b/net/netfilter/xt_quota2.c
index 24b774263aa6..869b192ad76c 100644
--- a/net/netfilter/xt_quota2.c
+++ b/net/netfilter/xt_quota2.c
@@ -169,10 +169,10 @@ static ssize_t quota_proc_write(struct file *file, const char __user *input,
return size;
}
-static const struct file_operations q2_counter_fops = {
- .read = quota_proc_read,
- .write = quota_proc_write,
- .llseek = default_llseek,
+static const struct proc_ops q2_counter_fops = {
+ .proc_read = quota_proc_read,
+ .proc_write = quota_proc_write,
+ .proc_lseek = default_llseek,
};
static struct xt_quota_counter *