From 9b5f1c910c5986dc62ec4f93a1e0da55fe43d056 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 14 Feb 2022 14:43:30 -0800 Subject: [PATCH] ANDROID: Replace "PDE_DATA" with "pde_data" Commit 359745d78351 ("proc: remove PDE_DATA() completely") removed PDE_DATA macro in favor of pde_data. So replace all instances of PDE_DATA to use pde_data. Fixes: 359745d78351 ("proc: remove PDE_DATA() completely") Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman Change-Id: I83ee420b78064500675d9970a4f0e4f0e8cb5baa --- drivers/misc/uid_sys_stats.c | 4 ++-- net/netfilter/xt_quota2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/misc/uid_sys_stats.c b/drivers/misc/uid_sys_stats.c index 47336700f687..a941c47e0672 100644 --- a/drivers/misc/uid_sys_stats.c +++ b/drivers/misc/uid_sys_stats.c @@ -381,7 +381,7 @@ static int uid_cputime_show(struct seq_file *m, void *v) static int uid_cputime_open(struct inode *inode, struct file *file) { - return single_open(file, uid_cputime_show, PDE_DATA(inode)); + return single_open(file, uid_cputime_show, pde_data(inode)); } static const struct proc_ops uid_cputime_fops = { @@ -556,7 +556,7 @@ static int uid_io_show(struct seq_file *m, void *v) static int uid_io_open(struct inode *inode, struct file *file) { - return single_open(file, uid_io_show, PDE_DATA(inode)); + return single_open(file, uid_io_show, pde_data(inode)); } static const struct proc_ops uid_io_fops = { diff --git a/net/netfilter/xt_quota2.c b/net/netfilter/xt_quota2.c index 641e36e89ce5..27acc866befb 100644 --- a/net/netfilter/xt_quota2.c +++ b/net/netfilter/xt_quota2.c @@ -134,7 +134,7 @@ static void quota2_log(unsigned int hooknum, static ssize_t quota_proc_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) { - struct xt_quota_counter *e = PDE_DATA(file_inode(file)); + struct xt_quota_counter *e = pde_data(file_inode(file)); char tmp[24]; size_t tmp_size; @@ -147,7 +147,7 @@ static ssize_t quota_proc_read(struct file *file, char __user *buf, static ssize_t quota_proc_write(struct file *file, const char __user *input, size_t size, loff_t *ppos) { - struct xt_quota_counter *e = PDE_DATA(file_inode(file)); + struct xt_quota_counter *e = pde_data(file_inode(file)); char buf[sizeof("18446744073709551616")]; if (size > sizeof(buf))