proc: remove PDE_DATA() completely

Remove PDE_DATA() completely and replace it with pde_data().

[akpm@linux-foundation.org: fix naming clash in drivers/nubus/proc.c]
[akpm@linux-foundation.org: now fix it properly]

Link: https://lkml.kernel.org/r/20211124081956.87711-2-songmuchun@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Alexey Gladkov <gladkov.alexey@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c
index 528d2be58182983b59c68ac76d5b362119519ec8..217b4dca51dd9fb8af068afbea941b587397155f 100644 (file)
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
@@ -83,14 +83,14 @@ static int srm_env_proc_show(struct seq_file *m, void *v)
 
 static int srm_env_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, srm_env_proc_show, PDE_DATA(inode));
+       return single_open(file, srm_env_proc_show, pde_data(inode));
 }
 
 static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,
                                  size_t count, loff_t *pos)
 {
        int res;
-       unsigned long   id = (unsigned long)PDE_DATA(file_inode(file));
+       unsigned long   id = (unsigned long)pde_data(file_inode(file));
        char            *buf = (char *) __get_free_page(GFP_USER);
        unsigned long   ret1, ret2;
 

diff --git a/arch/arm/kernel/atags_proc.c b/arch/arm/kernel/atags_proc.c
index 3c2faf2bd124e8f6383c247cf0ddff1f72a32dd0..3ec2afe78423278defddb9b89249f6e313681d51 100644 (file)
--- a/arch/arm/kernel/atags_proc.c
+++ b/arch/arm/kernel/atags_proc.c
@@ -13,7 +13,7 @@ struct buffer {
 static ssize_t atags_read(struct file *file, char __user *buf,
                          size_t count, loff_t *ppos)
 {
-       struct buffer *b = PDE_DATA(file_inode(file));
+       struct buffer *b = pde_data(file_inode(file));
        return simple_read_from_buffer(buf, count, ppos, b->data, b->size);
 }
 

diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index a25ab9b37953e75d6d27ff277b22f6b2e3e136ca..bd3ba276e69c3ca943e2f95aa2794b1b41f1363a 100644 (file)
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -282,7 +282,7 @@ salinfo_event_open(struct inode *inode, struct file *file)
 static ssize_t
 salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-       struct salinfo_data *data = PDE_DATA(file_inode(file));
+       struct salinfo_data *data = pde_data(file_inode(file));
        char cmd[32];
        size_t size;
        int i, n, cpu = -1;
@@ -340,7 +340,7 @@ static const struct proc_ops salinfo_event_proc_ops = {
 static int
 salinfo_log_open(struct inode *inode, struct file *file)
 {
-       struct salinfo_data *data = PDE_DATA(inode);
+       struct salinfo_data *data = pde_data(inode);
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
@@ -365,7 +365,7 @@ salinfo_log_open(struct inode *inode, struct file *file)
 static int
 salinfo_log_release(struct inode *inode, struct file *file)
 {
-       struct salinfo_data *data = PDE_DATA(inode);
+       struct salinfo_data *data = pde_data(inode);
 
        if (data->state == STATE_NO_DATA) {
                vfree(data->log_buffer);
@@ -433,7 +433,7 @@ retry:
 static ssize_t
 salinfo_log_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-       struct salinfo_data *data = PDE_DATA(file_inode(file));
+       struct salinfo_data *data = pde_data(file_inode(file));
        u8 *buf;
        u64 bufsize;
 
@@ -494,7 +494,7 @@ salinfo_log_clear(struct salinfo_data *data, int cpu)
 static ssize_t
 salinfo_log_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-       struct salinfo_data *data = PDE_DATA(file_inode(file));
+       struct salinfo_data *data = pde_data(file_inode(file));
        char cmd[32];
        size_t size;
        u32 offset;

diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c
index 877817471e3c12f657e18aab19e49c654674993c..6a029f2378e1833ed06406a4f16bfc95bf46d382 100644 (file)
--- a/arch/powerpc/kernel/proc_powerpc.c
+++ b/arch/powerpc/kernel/proc_powerpc.c
@@ -25,7 +25,7 @@ static ssize_t page_map_read( struct file *file, char __user *buf, size_t nbytes
                              loff_t *ppos)
 {
        return simple_read_from_buffer(buf, nbytes, ppos,
-                       PDE_DATA(file_inode(file)), PAGE_SIZE);
+                       pde_data(file_inode(file)), PAGE_SIZE);
 }
 
 static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
@@ -34,7 +34,7 @@ static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
                return -EINVAL;
 
        remap_pfn_range(vma, vma->vm_start,
-                       __pa(PDE_DATA(file_inode(file))) >> PAGE_SHIFT,
+                       __pa(pde_data(file_inode(file))) >> PAGE_SHIFT,
                        PAGE_SIZE, vma->vm_page_prot);
        return 0;
 }

diff --git a/arch/sh/mm/alignment.c b/arch/sh/mm/alignment.c
index d802801ceb9396d89ded23098c2e12ae2ee9ca5c..3a76a766f4232cbffd6071eaa0c4c9762c5c9c59 100644 (file)
--- a/arch/sh/mm/alignment.c
+++ b/arch/sh/mm/alignment.c
@@ -140,7 +140,7 @@ static int alignment_proc_open(struct inode *inode, struct file *file)
 static ssize_t alignment_proc_write(struct file *file,
                const char __user *buffer, size_t count, loff_t *pos)
 {
-       int *data = PDE_DATA(file_inode(file));
+       int *data = pde_data(file_inode(file));
        char mode;
 
        if (count > 0) {

diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
index 07b642c1916a87b0c1ac869c165235f24703ceff..8eb6ad1a3a1dec402dd852aa60224f250d4da440 100644 (file)
--- a/arch/xtensa/platforms/iss/simdisk.c
+++ b/arch/xtensa/platforms/iss/simdisk.c
@@ -208,7 +208,7 @@ static int simdisk_detach(struct simdisk *dev)
 static ssize_t proc_read_simdisk(struct file *file, char __user *buf,
                        size_t size, loff_t *ppos)
 {
-       struct simdisk *dev = PDE_DATA(file_inode(file));
+       struct simdisk *dev = pde_data(file_inode(file));
        const char *s = dev->filename;
        if (s) {
                ssize_t n = simple_read_from_buffer(buf, size, ppos,
@@ -225,7 +225,7 @@ static ssize_t proc_write_simdisk(struct file *file, const char __user *buf,
                        size_t count, loff_t *ppos)
 {
        char *tmp = memdup_user_nul(buf, count);
-       struct simdisk *dev = PDE_DATA(file_inode(file));
+       struct simdisk *dev = pde_data(file_inode(file));
        int err;
 
        if (IS_ERR(tmp))

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 0cca7991f18643c98ed2cf1f9328b98b2e9b76fb..4322f2da6d10d1efbdb690cfe1dfd66cabca0dea 100644 (file)
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -127,7 +127,7 @@ static int
 acpi_system_wakeup_device_open_fs(struct inode *inode, struct file *file)
 {
        return single_open(file, acpi_system_wakeup_device_seq_show,
-                          PDE_DATA(inode));
+                          pde_data(inode));
 }
 
 static const struct proc_ops acpi_system_wakeup_device_proc_ops = {

diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index d401f9acf45065348a8087eaf7544096e1214b30..9949eeb79378ed5da9d79424e7f125ae8e909a9d 100644 (file)
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -451,7 +451,7 @@ static int i8k_get_power_status(void)
 
 static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 {
-       struct dell_smm_data *data = PDE_DATA(file_inode(fp));
+       struct dell_smm_data *data = pde_data(file_inode(fp));
        int __user *argp = (int __user *)arg;
        int speed, err;
        int val = 0;
@@ -585,7 +585,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
 
 static int i8k_open_fs(struct inode *inode, struct file *file)
 {
-       return single_open(file, i8k_proc_show, PDE_DATA(inode));
+       return single_open(file, i8k_proc_show, pde_data(inode));
 }
 
 static const struct proc_ops i8k_proc_ops = {

diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c
index 2ec11af5f0cce2b4ac26efd39d01767efeb5796b..46b150e6289ef4607c8ddbcd2b833ff4dd64cc9b 100644 (file)
--- a/drivers/net/bonding/bond_procfs.c
+++ b/drivers/net/bonding/bond_procfs.c
@@ -11,7 +11,7 @@
 static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(RCU)
 {
-       struct bonding *bond = PDE_DATA(file_inode(seq->file));
+       struct bonding *bond = pde_data(file_inode(seq->file));
        struct list_head *iter;
        struct slave *slave;
        loff_t off = 0;
@@ -30,7 +30,7 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       struct bonding *bond = PDE_DATA(file_inode(seq->file));
+       struct bonding *bond = pde_data(file_inode(seq->file));
        struct list_head *iter;
        struct slave *slave;
        bool found = false;
@@ -57,7 +57,7 @@ static void bond_info_seq_stop(struct seq_file *seq, void *v)
 
 static void bond_info_show_master(struct seq_file *seq)
 {
-       struct bonding *bond = PDE_DATA(file_inode(seq->file));
+       struct bonding *bond = pde_data(file_inode(seq->file));
        const struct bond_opt_value *optval;
        struct slave *curr, *primary;
        int i;
@@ -175,7 +175,7 @@ static void bond_info_show_master(struct seq_file *seq)
 static void bond_info_show_slave(struct seq_file *seq,
                                 const struct slave *slave)
 {
-       struct bonding *bond = PDE_DATA(file_inode(seq->file));
+       struct bonding *bond = pde_data(file_inode(seq->file));
 
        seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
        seq_printf(seq, "MII Status: %s\n", bond_slave_link_status(slave->link));

diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c
index 45594f003ef7b47908644431f7888fab370db4e4..452d08545d31a219c8e453b7beaaf92fc943eacf 100644 (file)
--- a/drivers/net/wireless/cisco/airo.c
+++ b/drivers/net/wireless/cisco/airo.c
@@ -4672,7 +4672,7 @@ static ssize_t proc_write(struct file *file,
 static int proc_status_open(struct inode *inode, struct file *file)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *apriv = dev->ml_priv;
        CapabilityRid cap_rid;
        StatusRid status_rid;
@@ -4756,7 +4756,7 @@ static int proc_stats_rid_open(struct inode *inode,
                                u16 rid)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *apriv = dev->ml_priv;
        StatsRid stats;
        int i, j;
@@ -4819,7 +4819,7 @@ static inline int sniffing_mode(struct airo_info *ai)
 static void proc_config_on_close(struct inode *inode, struct file *file)
 {
        struct proc_data *data = file->private_data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        char *line;
 
@@ -5030,7 +5030,7 @@ static const char *get_rmode(__le16 mode)
 static int proc_config_open(struct inode *inode, struct file *file)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        int i;
        __le16 mode;
@@ -5120,7 +5120,7 @@ static int proc_config_open(struct inode *inode, struct file *file)
 static void proc_SSID_on_close(struct inode *inode, struct file *file)
 {
        struct proc_data *data = file->private_data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        SsidRid SSID_rid;
        int i;
@@ -5156,7 +5156,7 @@ static void proc_SSID_on_close(struct inode *inode, struct file *file)
 static void proc_APList_on_close(struct inode *inode, struct file *file)
 {
        struct proc_data *data = file->private_data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        APListRid *APList_rid = &ai->APList;
        int i;
@@ -5280,7 +5280,7 @@ static int set_wep_tx_idx(struct airo_info *ai, u16 index, int perm, int lock)
 static void proc_wepkey_on_close(struct inode *inode, struct file *file)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        int i, rc;
        char key[16];
@@ -5331,7 +5331,7 @@ static void proc_wepkey_on_close(struct inode *inode, struct file *file)
 static int proc_wepkey_open(struct inode *inode, struct file *file)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        char *ptr;
        WepKeyRid wkr;
@@ -5379,7 +5379,7 @@ static int proc_wepkey_open(struct inode *inode, struct file *file)
 static int proc_SSID_open(struct inode *inode, struct file *file)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        int i;
        char *ptr;
@@ -5423,7 +5423,7 @@ static int proc_SSID_open(struct inode *inode, struct file *file)
 static int proc_APList_open(struct inode *inode, struct file *file)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        int i;
        char *ptr;
@@ -5462,7 +5462,7 @@ static int proc_APList_open(struct inode *inode, struct file *file)
 static int proc_BSSList_open(struct inode *inode, struct file *file)
 {
        struct proc_data *data;
-       struct net_device *dev = PDE_DATA(inode);
+       struct net_device *dev = pde_data(inode);
        struct airo_info *ai = dev->ml_priv;
        char *ptr;
        BSSListRid BSSList_rid;

diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c
index 8bcc1cdcb75b02492ceaaf3313a6c1e432e17be9..462ccc7d7d1ac9c97972a08a8be9f672200326dc 100644 (file)
--- a/drivers/net/wireless/intersil/hostap/hostap_ap.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_ap.c
@@ -69,7 +69,7 @@ static void prism2_send_mgmt(struct net_device *dev,
 #if !defined(PRISM2_NO_PROCFS_DEBUG) && defined(CONFIG_PROC_FS)
 static int ap_debug_proc_show(struct seq_file *m, void *v)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
 
        seq_printf(m, "BridgedUnicastFrames=%u\n", ap->bridged_unicast);
        seq_printf(m, "BridgedMulticastFrames=%u\n", ap->bridged_multicast);
@@ -320,7 +320,7 @@ void hostap_deauth_all_stas(struct net_device *dev, struct ap_data *ap,
 
 static int ap_control_proc_show(struct seq_file *m, void *v)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
        char *policy_txt;
        struct mac_entry *entry;
 
@@ -352,20 +352,20 @@ static int ap_control_proc_show(struct seq_file *m, void *v)
 
 static void *ap_control_proc_start(struct seq_file *m, loff_t *_pos)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
        spin_lock_bh(&ap->mac_restrictions.lock);
        return seq_list_start_head(&ap->mac_restrictions.mac_list, *_pos);
 }
 
 static void *ap_control_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
        return seq_list_next(v, &ap->mac_restrictions.mac_list, _pos);
 }
 
 static void ap_control_proc_stop(struct seq_file *m, void *v)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
        spin_unlock_bh(&ap->mac_restrictions.lock);
 }
 
@@ -554,20 +554,20 @@ static int prism2_ap_proc_show(struct seq_file *m, void *v)
 
 static void *prism2_ap_proc_start(struct seq_file *m, loff_t *_pos)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
        spin_lock_bh(&ap->sta_table_lock);
        return seq_list_start_head(&ap->sta_list, *_pos);
 }
 
 static void *prism2_ap_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
        return seq_list_next(v, &ap->sta_list, _pos);
 }
 
 static void prism2_ap_proc_stop(struct seq_file *m, void *v)
 {
-       struct ap_data *ap = PDE_DATA(file_inode(m->file));
+       struct ap_data *ap = pde_data(file_inode(m->file));
        spin_unlock_bh(&ap->sta_table_lock);
 }
 

diff --git a/drivers/net/wireless/intersil/hostap/hostap_download.c b/drivers/net/wireless/intersil/hostap/hostap_download.c
index 7c6a5a6d1d45d8057bd008ed6dda043921ab490e..3672291ced5c843c808d910beb2159afeff51ceb 100644 (file)
--- a/drivers/net/wireless/intersil/hostap/hostap_download.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_download.c
@@ -227,7 +227,7 @@ static int prism2_download_aux_dump_proc_open(struct inode *inode, struct file *
                                   sizeof(struct prism2_download_aux_dump));
        if (ret == 0) {
                struct seq_file *m = file->private_data;
-               m->private = PDE_DATA(inode);
+               m->private = pde_data(inode);
        }
        return ret;
 }

diff --git a/drivers/net/wireless/intersil/hostap/hostap_proc.c b/drivers/net/wireless/intersil/hostap/hostap_proc.c
index 51c847d98755d0c17dde822daea3128dc8adeb94..61f68786056f40c4188f9a0c1e49ef7630e28bca 100644 (file)
--- a/drivers/net/wireless/intersil/hostap/hostap_proc.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_proc.c
@@ -97,20 +97,20 @@ static int prism2_wds_proc_show(struct seq_file *m, void *v)
 
 static void *prism2_wds_proc_start(struct seq_file *m, loff_t *_pos)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        read_lock_bh(&local->iface_lock);
        return seq_list_start(&local->hostap_interfaces, *_pos);
 }
 
 static void *prism2_wds_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        return seq_list_next(v, &local->hostap_interfaces, _pos);
 }
 
 static void prism2_wds_proc_stop(struct seq_file *m, void *v)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        read_unlock_bh(&local->iface_lock);
 }
 
@@ -123,7 +123,7 @@ static const struct seq_operations prism2_wds_proc_seqops = {
 
 static int prism2_bss_list_proc_show(struct seq_file *m, void *v)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        struct list_head *ptr = v;
        struct hostap_bss_info *bss;
 
@@ -151,21 +151,21 @@ static int prism2_bss_list_proc_show(struct seq_file *m, void *v)
 static void *prism2_bss_list_proc_start(struct seq_file *m, loff_t *_pos)
        __acquires(&local->lock)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        spin_lock_bh(&local->lock);
        return seq_list_start_head(&local->bss_list, *_pos);
 }
 
 static void *prism2_bss_list_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        return seq_list_next(v, &local->bss_list, _pos);
 }
 
 static void prism2_bss_list_proc_stop(struct seq_file *m, void *v)
        __releases(&local->lock)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        spin_unlock_bh(&local->lock);
 }
 
@@ -198,7 +198,7 @@ static int prism2_crypt_proc_show(struct seq_file *m, void *v)
 static ssize_t prism2_pda_proc_read(struct file *file, char __user *buf,
                                    size_t count, loff_t *_pos)
 {
-       local_info_t *local = PDE_DATA(file_inode(file));
+       local_info_t *local = pde_data(file_inode(file));
        size_t off;
 
        if (local->pda == NULL || *_pos >= PRISM2_PDA_SIZE)
@@ -272,7 +272,7 @@ static int prism2_io_debug_proc_read(char *page, char **start, off_t off,
 #ifndef PRISM2_NO_STATION_MODES
 static int prism2_scan_results_proc_show(struct seq_file *m, void *v)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        unsigned long entry;
        int i, len;
        struct hfa384x_hostscan_result *scanres;
@@ -322,7 +322,7 @@ static int prism2_scan_results_proc_show(struct seq_file *m, void *v)
 
 static void *prism2_scan_results_proc_start(struct seq_file *m, loff_t *_pos)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        spin_lock_bh(&local->lock);
 
        /* We have a header (pos 0) + N results to show (pos 1...N) */
@@ -333,7 +333,7 @@ static void *prism2_scan_results_proc_start(struct seq_file *m, loff_t *_pos)
 
 static void *prism2_scan_results_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
 
        ++*_pos;
        if (*_pos > local->last_scan_results_count)
@@ -343,7 +343,7 @@ static void *prism2_scan_results_proc_next(struct seq_file *m, void *v, loff_t *
 
 static void prism2_scan_results_proc_stop(struct seq_file *m, void *v)
 {
-       local_info_t *local = PDE_DATA(file_inode(m->file));
+       local_info_t *local = pde_data(file_inode(m->file));
        spin_unlock_bh(&local->lock);
 }
 

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index e3a3dc3e45b43a3da287d0e0d515e95c260e5309..2987ad9271f64706f2e126575218d5621cfbc5b3 100644 (file)
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2746,7 +2746,7 @@ static ssize_t int_proc_write(struct file *file, const char __user *buffer,
                nr = nr * 10 + c;
                p++;
        } while (--len);
-       *(int *)PDE_DATA(file_inode(file)) = nr;
+       *(int *)pde_data(file_inode(file)) = nr;
        return count;
 }
 

diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c
index 88e1f9a0faafd6a35f9bbf8ee7648b7b0eaf9b44..1fd667852271fd5495729f3782c97808b92e6fe8 100644 (file)
--- a/drivers/nubus/proc.c
+++ b/drivers/nubus/proc.c
@@ -93,30 +93,30 @@ struct nubus_proc_pde_data {
 static struct nubus_proc_pde_data *
 nubus_proc_alloc_pde_data(unsigned char *ptr, unsigned int size)
 {
-       struct nubus_proc_pde_data *pde_data;
+       struct nubus_proc_pde_data *pded;
 
-       pde_data = kmalloc(sizeof(*pde_data), GFP_KERNEL);
-       if (!pde_data)
+       pded = kmalloc(sizeof(*pded), GFP_KERNEL);
+       if (!pded)
                return NULL;
 
-       pde_data->res_ptr = ptr;
-       pde_data->res_size = size;
-       return pde_data;
+       pded->res_ptr = ptr;
+       pded->res_size = size;
+       return pded;
 }
 
 static int nubus_proc_rsrc_show(struct seq_file *m, void *v)
 {
        struct inode *inode = m->private;
-       struct nubus_proc_pde_data *pde_data;
+       struct nubus_proc_pde_data *pded;
 
-       pde_data = PDE_DATA(inode);
-       if (!pde_data)
+       pded = pde_data(inode);
+       if (!pded)
                return 0;
 
-       if (pde_data->res_size > m->size)
+       if (pded->res_size > m->size)
                return -EFBIG;
 
-       if (pde_data->res_size) {
+       if (pded->res_size) {
                int lanes = (int)proc_get_parent_data(inode);
                struct nubus_dirent ent;
 
@@ -124,11 +124,11 @@ static int nubus_proc_rsrc_show(struct seq_file *m, void *v)
                        return 0;
 
                ent.mask = lanes;
-               ent.base = pde_data->res_ptr;
+               ent.base = pded->res_ptr;
                ent.data = 0;
-               nubus_seq_write_rsrc_mem(m, &ent, pde_data->res_size);
+               nubus_seq_write_rsrc_mem(m, &ent, pded->res_size);
        } else {
-               unsigned int data = (unsigned int)pde_data->res_ptr;
+               unsigned int data = (unsigned int)pded->res_ptr;
 
                seq_putc(m, data >> 16);
                seq_putc(m, data >> 8);
@@ -142,18 +142,18 @@ void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
                             unsigned int size)
 {
        char name[9];
-       struct nubus_proc_pde_data *pde_data;
+       struct nubus_proc_pde_data *pded;
 
        if (!procdir)
                return;
 
        snprintf(name, sizeof(name), "%x", ent->type);
        if (size)
-               pde_data = nubus_proc_alloc_pde_data(nubus_dirptr(ent), size);
+               pded = nubus_proc_alloc_pde_data(nubus_dirptr(ent), size);
        else
-               pde_data = NULL;
+               pded = NULL;
        proc_create_single_data(name, S_IFREG | 0444, procdir,
-                       nubus_proc_rsrc_show, pde_data);
+                       nubus_proc_rsrc_show, pded);
 }
 
 void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index cf91cb024be304307485a567177826ded6022fd3..1e4a5663d01122bffa88f0ecae49fdf3d5a6f3de 100644 (file)
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -168,14 +168,14 @@ static int led_proc_show(struct seq_file *m, void *v)
 
 static int led_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, led_proc_show, PDE_DATA(inode));
+       return single_open(file, led_proc_show, pde_data(inode));
 }
 
 
 static ssize_t led_proc_write(struct file *file, const char __user *buf,
        size_t count, loff_t *pos)
 {
-       void *data = PDE_DATA(file_inode(file));
+       void *data = pde_data(file_inode(file));
        char *cur, lbuf[32];
        int d;
 

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index cb18f8a13ab66fce5bfbc3f93b2feaba7535c61f..9c7edec64f7e24bed44b3cd8e6afd3b1b909a0d1 100644 (file)
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -21,14 +21,14 @@ static int proc_initialized;        /* = 0 */
 
 static loff_t proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
 {
-       struct pci_dev *dev = PDE_DATA(file_inode(file));
+       struct pci_dev *dev = pde_data(file_inode(file));
        return fixed_size_llseek(file, off, whence, dev->cfg_size);
 }
 
 static ssize_t proc_bus_pci_read(struct file *file, char __user *buf,
                                 size_t nbytes, loff_t *ppos)
 {
-       struct pci_dev *dev = PDE_DATA(file_inode(file));
+       struct pci_dev *dev = pde_data(file_inode(file));
        unsigned int pos = *ppos;
        unsigned int cnt, size;
 
@@ -114,7 +114,7 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
                                  size_t nbytes, loff_t *ppos)
 {
        struct inode *ino = file_inode(file);
-       struct pci_dev *dev = PDE_DATA(ino);
+       struct pci_dev *dev = pde_data(ino);
        int pos = *ppos;
        int size = dev->cfg_size;
        int cnt, ret;
@@ -196,7 +196,7 @@ struct pci_filp_private {
 static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
                               unsigned long arg)
 {
-       struct pci_dev *dev = PDE_DATA(file_inode(file));
+       struct pci_dev *dev = pde_data(file_inode(file));
 #ifdef HAVE_PCI_MMAP
        struct pci_filp_private *fpriv = file->private_data;
 #endif /* HAVE_PCI_MMAP */
@@ -244,7 +244,7 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
 #ifdef HAVE_PCI_MMAP
 static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
 {
-       struct pci_dev *dev = PDE_DATA(file_inode(file));
+       struct pci_dev *dev = pde_data(file_inode(file));
        struct pci_filp_private *fpriv = file->private_data;
        int i, ret, write_combine = 0, res_bit = IORESOURCE_MEM;
 

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 82fa6148216c7118ca8f3f9673e7b8549f1cc1b3..098180fb1cfc9c0c34837006628a872e609e07b8 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -880,14 +880,14 @@ static int dispatch_proc_show(struct seq_file *m, void *v)
 
 static int dispatch_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, dispatch_proc_show, PDE_DATA(inode));
+       return single_open(file, dispatch_proc_show, pde_data(inode));
 }
 
 static ssize_t dispatch_proc_write(struct file *file,
                        const char __user *userbuf,
                        size_t count, loff_t *pos)
 {
-       struct ibm_struct *ibm = PDE_DATA(file_inode(file));
+       struct ibm_struct *ibm = pde_data(file_inode(file));
        char *kernbuf;
        int ret;
 

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 352508d30467535ba12d4826292a818db52f40d3..f113dec98e21dbd37f6a977840ebe68fb491cd30 100644 (file)
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1368,7 +1368,7 @@ static int lcd_proc_show(struct seq_file *m, void *v)
 
 static int lcd_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, lcd_proc_show, PDE_DATA(inode));
+       return single_open(file, lcd_proc_show, pde_data(inode));
 }
 
 static int set_lcd_brightness(struct toshiba_acpi_dev *dev, int value)
@@ -1404,7 +1404,7 @@ static int set_lcd_status(struct backlight_device *bd)
 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
                              size_t count, loff_t *pos)
 {
-       struct toshiba_acpi_dev *dev = PDE_DATA(file_inode(file));
+       struct toshiba_acpi_dev *dev = pde_data(file_inode(file));
        char cmd[42];
        size_t len;
        int levels;
@@ -1469,13 +1469,13 @@ static int video_proc_show(struct seq_file *m, void *v)
 
 static int video_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, video_proc_show, PDE_DATA(inode));
+       return single_open(file, video_proc_show, pde_data(inode));
 }
 
 static ssize_t video_proc_write(struct file *file, const char __user *buf,
                                size_t count, loff_t *pos)
 {
-       struct toshiba_acpi_dev *dev = PDE_DATA(file_inode(file));
+       struct toshiba_acpi_dev *dev = pde_data(file_inode(file));
        char *buffer;
        char *cmd;
        int lcd_out = -1, crt_out = -1, tv_out = -1;
@@ -1580,13 +1580,13 @@ static int fan_proc_show(struct seq_file *m, void *v)
 
 static int fan_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, fan_proc_show, PDE_DATA(inode));
+       return single_open(file, fan_proc_show, pde_data(inode));
 }
 
 static ssize_t fan_proc_write(struct file *file, const char __user *buf,
                              size_t count, loff_t *pos)
 {
-       struct toshiba_acpi_dev *dev = PDE_DATA(file_inode(file));
+       struct toshiba_acpi_dev *dev = pde_data(file_inode(file));
        char cmd[42];
        size_t len;
        int value;
@@ -1628,13 +1628,13 @@ static int keys_proc_show(struct seq_file *m, void *v)
 
 static int keys_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, keys_proc_show, PDE_DATA(inode));
+       return single_open(file, keys_proc_show, pde_data(inode));
 }
 
 static ssize_t keys_proc_write(struct file *file, const char __user *buf,
                               size_t count, loff_t *pos)
 {
-       struct toshiba_acpi_dev *dev = PDE_DATA(file_inode(file));
+       struct toshiba_acpi_dev *dev = pde_data(file_inode(file));
        char cmd[42];
        size_t len;
        int value;

diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 1ae458c02656cb152ec1cd7fea49d1f0d108446e..55ae72a2818bbfa79230bea808dfd86c4bdfb2e1 100644 (file)
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -22,7 +22,7 @@ static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)
 static ssize_t isapnp_proc_bus_read(struct file *file, char __user * buf,
                                    size_t nbytes, loff_t * ppos)
 {
-       struct pnp_dev *dev = PDE_DATA(file_inode(file));
+       struct pnp_dev *dev = pde_data(file_inode(file));
        int pos = *ppos;
        int cnt, size = 256;
 

diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index a806830e3a407f294a4764bb40f0cfc934b8ed18..0f0d819b157fd8c8fd7769f6cd7818fc01e8ece4 100644 (file)
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -173,13 +173,13 @@ static int pnpbios_proc_show(struct seq_file *m, void *v)
 
 static int pnpbios_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, pnpbios_proc_show, PDE_DATA(inode));
+       return single_open(file, pnpbios_proc_show, pde_data(inode));
 }
 
 static ssize_t pnpbios_proc_write(struct file *file, const char __user *buf,
                                  size_t count, loff_t *pos)
 {
-       void *data = PDE_DATA(file_inode(file));
+       void *data = pde_data(file_inode(file));
        struct pnp_bios_node *node;
        int boot = (long)data >> 8;
        u8 nodenum = (long)data;

diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index d6982d3557396b02fd89f5a664450a8a50a37719..95aee1ad1383408482fd4000893b8f141ee5dea5 100644 (file)
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -49,7 +49,7 @@ static DEFINE_MUTEX(global_host_template_mutex);
 static ssize_t proc_scsi_host_write(struct file *file, const char __user *buf,
                            size_t count, loff_t *ppos)
 {
-       struct Scsi_Host *shost = PDE_DATA(file_inode(file));
+       struct Scsi_Host *shost = pde_data(file_inode(file));
        ssize_t ret = -ENOMEM;
        char *page;
     
@@ -79,7 +79,7 @@ static int proc_scsi_show(struct seq_file *m, void *v)
 
 static int proc_scsi_host_open(struct inode *inode, struct file *file)
 {
-       return single_open_size(file, proc_scsi_show, PDE_DATA(inode),
+       return single_open_size(file, proc_scsi_show, pde_data(inode),
                                4 * PAGE_SIZE);
 }
 

diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index 64de9f1b874c55a3fdb4dddb49ecbdc4eec0aa1b..431d5a7d737e2b0f43e062f095ed67b4605be3d4 100644 (file)
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -1117,7 +1117,7 @@ static int rndis_proc_show(struct seq_file *m, void *v)
 static ssize_t rndis_proc_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *ppos)
 {
-       rndis_params *p = PDE_DATA(file_inode(file));
+       rndis_params *p = pde_data(file_inode(file));
        u32 speed = 0;
        int i, fl_speed = 0;
 
@@ -1161,7 +1161,7 @@ static ssize_t rndis_proc_write(struct file *file, const char __user *buffer,
 
 static int rndis_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, rndis_proc_show, PDE_DATA(inode));
+       return single_open(file, rndis_proc_show, pde_data(inode));
 }
 
 static const struct proc_ops rndis_proc_ops = {

diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 1c9ae08225d8d818ab6550adc4346032bb5fa893..f916bf60b312faf7f85d36fab1b2bcaa48d5d883 100644 (file)
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -30,7 +30,7 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
 static ssize_t
 proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
-       struct zorro_dev *z = PDE_DATA(file_inode(file));
+       struct zorro_dev *z = pde_data(file_inode(file));
        struct ConfigDev cd;
        loff_t pos = *ppos;
 

diff --git a/fs/afs/proc.c b/fs/afs/proc.c
index 065a28bfa3f18384881cce5cf47d09d1b6e6fd07..e1b863449296c32a93408d72ba1c88a0c7ddf944 100644 (file)
--- a/fs/afs/proc.c
+++ b/fs/afs/proc.c
@@ -227,7 +227,7 @@ static int afs_proc_cell_volumes_show(struct seq_file *m, void *v)
 static void *afs_proc_cell_volumes_start(struct seq_file *m, loff_t *_pos)
        __acquires(cell->proc_lock)
 {
-       struct afs_cell *cell = PDE_DATA(file_inode(m->file));
+       struct afs_cell *cell = pde_data(file_inode(m->file));
 
        rcu_read_lock();
        return seq_hlist_start_head_rcu(&cell->proc_volumes, *_pos);
@@ -236,7 +236,7 @@ static void *afs_proc_cell_volumes_start(struct seq_file *m, loff_t *_pos)
 static void *afs_proc_cell_volumes_next(struct seq_file *m, void *v,
                                        loff_t *_pos)
 {
-       struct afs_cell *cell = PDE_DATA(file_inode(m->file));
+       struct afs_cell *cell = pde_data(file_inode(m->file));
 
        return seq_hlist_next_rcu(v, &cell->proc_volumes, _pos);
 }
@@ -322,7 +322,7 @@ static void *afs_proc_cell_vlservers_start(struct seq_file *m, loff_t *_pos)
 {
        struct afs_vl_seq_net_private *priv = m->private;
        struct afs_vlserver_list *vllist;
-       struct afs_cell *cell = PDE_DATA(file_inode(m->file));
+       struct afs_cell *cell = pde_data(file_inode(m->file));
        loff_t pos = *_pos;
 
        rcu_read_lock();

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index cf2fd9fc7d986a16ed502c3d8bf19582674c487d..9f86dd947032706b61db6f0b2a0f5cc699bf13a5 100644 (file)
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2834,7 +2834,7 @@ out:
 
 static void *ext4_mb_seq_groups_start(struct seq_file *seq, loff_t *pos)
 {
-       struct super_block *sb = PDE_DATA(file_inode(seq->file));
+       struct super_block *sb = pde_data(file_inode(seq->file));
        ext4_group_t group;
 
        if (*pos < 0 || *pos >= ext4_get_groups_count(sb))
@@ -2845,7 +2845,7 @@ static void *ext4_mb_seq_groups_start(struct seq_file *seq, loff_t *pos)
 
 static void *ext4_mb_seq_groups_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       struct super_block *sb = PDE_DATA(file_inode(seq->file));
+       struct super_block *sb = pde_data(file_inode(seq->file));
        ext4_group_t group;
 
        ++*pos;
@@ -2857,7 +2857,7 @@ static void *ext4_mb_seq_groups_next(struct seq_file *seq, void *v, loff_t *pos)
 
 static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
 {
-       struct super_block *sb = PDE_DATA(file_inode(seq->file));
+       struct super_block *sb = pde_data(file_inode(seq->file));
        ext4_group_t group = (ext4_group_t) ((unsigned long) v);
        int i;
        int err, buddy_loaded = 0;
@@ -2985,7 +2985,7 @@ int ext4_seq_mb_stats_show(struct seq_file *seq, void *offset)
 static void *ext4_mb_seq_structs_summary_start(struct seq_file *seq, loff_t *pos)
 __acquires(&EXT4_SB(sb)->s_mb_rb_lock)
 {
-       struct super_block *sb = PDE_DATA(file_inode(seq->file));
+       struct super_block *sb = pde_data(file_inode(seq->file));
        unsigned long position;
 
        read_lock(&EXT4_SB(sb)->s_mb_rb_lock);
@@ -2998,7 +2998,7 @@ __acquires(&EXT4_SB(sb)->s_mb_rb_lock)
 
 static void *ext4_mb_seq_structs_summary_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       struct super_block *sb = PDE_DATA(file_inode(seq->file));
+       struct super_block *sb = pde_data(file_inode(seq->file));
        unsigned long position;
 
        ++*pos;
@@ -3010,7 +3010,7 @@ static void *ext4_mb_seq_structs_summary_next(struct seq_file *seq, void *v, lof
 
 static int ext4_mb_seq_structs_summary_show(struct seq_file *seq, void *v)
 {
-       struct super_block *sb = PDE_DATA(file_inode(seq->file));
+       struct super_block *sb = pde_data(file_inode(seq->file));
        struct ext4_sb_info *sbi = EXT4_SB(sb);
        unsigned long position = ((unsigned long) v);
        struct ext4_group_info *grp;
@@ -3058,7 +3058,7 @@ static int ext4_mb_seq_structs_summary_show(struct seq_file *seq, void *v)
 static void ext4_mb_seq_structs_summary_stop(struct seq_file *seq, void *v)
 __releases(&EXT4_SB(sb)->s_mb_rb_lock)
 {
-       struct super_block *sb = PDE_DATA(file_inode(seq->file));
+       struct super_block *sb = pde_data(file_inode(seq->file));
 
        read_unlock(&EXT4_SB(sb)->s_mb_rb_lock);
 }

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 0b86a4365b669e14b1bc0b3b60aedb4c6b92e0ba..f13d548e4a7fda61d27936cf03e5365481633dac 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1212,7 +1212,7 @@ static const struct seq_operations jbd2_seq_info_ops = {
 
 static int jbd2_seq_info_open(struct inode *inode, struct file *file)
 {
-       journal_t *journal = PDE_DATA(inode);
+       journal_t *journal = pde_data(inode);
        struct jbd2_stats_proc_session *s;
        int rc, size;
 

diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 39b823ab2564edf62fd08983ec44560b1120ee24..e1cfeda397f3fb88004854cd15e4087b48e7a54d 100644 (file)
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -138,7 +138,7 @@ EXPORT_SYMBOL_GPL(proc_create_net_data);
  * @parent: The parent directory in which to create.
  * @ops: The seq_file ops with which to read the file.
  * @write: The write method with which to 'modify' the file.
- * @data: Data for retrieval by PDE_DATA().
+ * @data: Data for retrieval by pde_data().
  *
  * Create a network namespaced proc file in the @parent directory with the
  * specified @name and @mode that allows reading of a file that displays a
@@ -153,7 +153,7 @@ EXPORT_SYMBOL_GPL(proc_create_net_data);
  * modified by the @write function.  @write should return 0 on success.
  *
  * The @data value is accessible from the @show and @write functions by calling
- * PDE_DATA() on the file inode.  The network namespace must be accessed by
+ * pde_data() on the file inode.  The network namespace must be accessed by
  * calling seq_file_net() on the seq_file struct.
  */
 struct proc_dir_entry *proc_create_net_data_write(const char *name, umode_t mode,
@@ -230,7 +230,7 @@ EXPORT_SYMBOL_GPL(proc_create_net_single);
  * @parent: The parent directory in which to create.
  * @show: The seqfile show method with which to read the file.
  * @write: The write method with which to 'modify' the file.
- * @data: Data for retrieval by PDE_DATA().
+ * @data: Data for retrieval by pde_data().
  *
  * Create a network-namespaced proc file in the @parent directory with the
  * specified @name and @mode that allows reading of a file that displays a
@@ -245,7 +245,7 @@ EXPORT_SYMBOL_GPL(proc_create_net_single);
  * modified by the @write function.  @write should return 0 on success.
  *
  * The @data value is accessible from the @show and @write functions by calling
- * PDE_DATA() on the file inode.  The network namespace must be accessed by
+ * pde_data() on the file inode.  The network namespace must be accessed by
  * calling seq_file_single_net() on the seq_file struct.
  */
 struct proc_dir_entry *proc_create_net_single_write(const char *name, umode_t mode,

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index b6e7005cc1b2797ca7454f7986adae917cf76172..81d6e4ec2294b5576ca973d98d0d61e78a215838 100644 (file)
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -120,8 +120,6 @@ static inline void *pde_data(const struct inode *inode)
        return inode->i_private;
 }
 
-#define PDE_DATA(i)    pde_data(i)
-
 extern void *proc_get_parent_data(const struct inode *);
 extern void proc_remove(struct proc_dir_entry *);
 extern void remove_proc_entry(const char *, struct proc_dir_entry *);
@@ -202,7 +200,7 @@ proc_create_data(const char *name, umode_t mode, struct proc_dir_entry *parent,
 
 static inline void proc_set_size(struct proc_dir_entry *de, loff_t size) {}
 static inline void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) {}
-static inline void *PDE_DATA(const struct inode *inode) {BUG(); return NULL;}
+static inline void *pde_data(const struct inode *inode) {BUG(); return NULL;}
 static inline void *proc_get_parent_data(const struct inode *inode) { BUG(); return NULL; }
 
 static inline void proc_remove(struct proc_dir_entry *de) {}

diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 72dbb44a4573b77c617cde0e5e75652240501d41..88cc16444b43125e5fbd274868013fe29869e465 100644 (file)
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -209,7 +209,7 @@ static const struct file_operations __name ## _fops = {                     \
 #define DEFINE_PROC_SHOW_ATTRIBUTE(__name)                             \
 static int __name ## _open(struct inode *inode, struct file *file)     \
 {                                                                      \
-       return single_open(file, __name ## _show, PDE_DATA(inode));     \
+       return single_open(file, __name ## _show, pde_data(inode));     \
 }                                                                      \
                                                                        \
 static const struct proc_ops __name ## _proc_ops = {                   \

diff --git a/ipc/util.c b/ipc/util.c
index fa2d86ef3fb80b1a828043190a69f8c935715354..a2208d0f26b2df52605ad610758b7b8b6f64a46f 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -894,7 +894,7 @@ static int sysvipc_proc_open(struct inode *inode, struct file *file)
        if (!iter)
                return -ENOMEM;
 
-       iter->iface = PDE_DATA(inode);
+       iter->iface = pde_data(inode);
        iter->ns    = get_ipc_ns(current->nsproxy->ipc_ns);
        iter->pid_ns = get_pid_ns(task_active_pid_ns(current));
 

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index ee595ec09778da4fd822b518a934663992db108a..623b8136e9af3b86040102392e63c1ff4a5a04aa 100644 (file)
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -137,7 +137,7 @@ static inline int irq_select_affinity_usr(unsigned int irq)
 static ssize_t write_irq_affinity(int type, struct file *file,
                const char __user *buffer, size_t count, loff_t *pos)
 {
-       unsigned int irq = (int)(long)PDE_DATA(file_inode(file));
+       unsigned int irq = (int)(long)pde_data(file_inode(file));
        cpumask_var_t new_value;
        int err;
 
@@ -190,12 +190,12 @@ static ssize_t irq_affinity_list_proc_write(struct file *file,
 
 static int irq_affinity_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, irq_affinity_proc_show, PDE_DATA(inode));
+       return single_open(file, irq_affinity_proc_show, pde_data(inode));
 }
 
 static int irq_affinity_list_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, irq_affinity_list_proc_show, PDE_DATA(inode));
+       return single_open(file, irq_affinity_list_proc_show, pde_data(inode));
 }
 
 static const struct proc_ops irq_affinity_proc_ops = {
@@ -265,7 +265,7 @@ out:
 
 static int default_affinity_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, default_affinity_show, PDE_DATA(inode));
+       return single_open(file, default_affinity_show, pde_data(inode));
 }
 
 static const struct proc_ops default_affinity_proc_ops = {

diff --git a/kernel/resource.c b/kernel/resource.c
index 5ad3eba619ba755fedfce2462582e0f7c0116061..9c08d6e9eef27533baa011ed637c0b40338a0f3c 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -99,7 +99,7 @@ enum { MAX_IORES_LEVEL = 5 };
 static void *r_start(struct seq_file *m, loff_t *pos)
        __acquires(resource_lock)
 {
-       struct resource *p = PDE_DATA(file_inode(m->file));
+       struct resource *p = pde_data(file_inode(m->file));
        loff_t l = 0;
        read_lock(&resource_lock);
        for (p = p->child; p && l < *pos; p = r_next(m, p, &l))
@@ -115,7 +115,7 @@ static void r_stop(struct seq_file *m, void *v)
 
 static int r_show(struct seq_file *m, void *v)
 {
-       struct resource *root = PDE_DATA(file_inode(m->file));
+       struct resource *root = pde_data(file_inode(m->file));
        struct resource *r = v, *p;
        unsigned long long start, end;
        int width = root->end < 0x10000 ? 4 : 8;

diff --git a/net/atm/proc.c b/net/atm/proc.c
index 4369ffa3302a26cdd575a7045602548199d39300..9bf736290e48c9e122bf62ea247966a3a75c2959 100644 (file)
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -108,7 +108,7 @@ out:
 static inline void *vcc_walk(struct seq_file *seq, loff_t l)
 {
        struct vcc_state *state = seq->private;
-       int family = (uintptr_t)(PDE_DATA(file_inode(seq->file)));
+       int family = (uintptr_t)(pde_data(file_inode(seq->file)));
 
        return __vcc_walk(&state->sk, family, &state->bucket, l) ?
               state : NULL;
@@ -324,7 +324,7 @@ static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
        page = get_zeroed_page(GFP_KERNEL);
        if (!page)
                return -ENOMEM;
-       dev = PDE_DATA(file_inode(file));
+       dev = pde_data(file_inode(file));
        if (!dev->ops->proc_read)
                length = -EINVAL;
        else {

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 1661979b6a6e8d0f4f64d0df0ded0536cc7918c7..ee319779781e64657d6e7c3090086c94a5ec6cb7 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -611,7 +611,7 @@ EXPORT_SYMBOL(bt_sock_wait_ready);
 static void *bt_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(seq->private->l->lock)
 {
-       struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
+       struct bt_sock_list *l = pde_data(file_inode(seq->file));
 
        read_lock(&l->lock);
        return seq_hlist_start_head(&l->head, *pos);
@@ -619,7 +619,7 @@ static void *bt_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *bt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
+       struct bt_sock_list *l = pde_data(file_inode(seq->file));
 
        return seq_hlist_next(v, &l->head, pos);
 }
@@ -627,14 +627,14 @@ static void *bt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 static void bt_seq_stop(struct seq_file *seq, void *v)
        __releases(seq->private->l->lock)
 {
-       struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
+       struct bt_sock_list *l = pde_data(file_inode(seq->file));
 
        read_unlock(&l->lock);
 }
 
 static int bt_seq_show(struct seq_file *seq, void *v)
 {
-       struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
+       struct bt_sock_list *l = pde_data(file_inode(seq->file));
 
        if (v == SEQ_START_TOKEN) {
                seq_puts(seq, "sk               RefCnt Rmem   Wmem   User   Inode  Parent");

diff --git a/net/can/bcm.c b/net/can/bcm.c
index bc88d901a1c0c8d3d28a5d0ce7ed63c3528efd82..95d209b52e6a6df1b3df9504afc2c486c8271961 100644 (file)
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -193,7 +193,7 @@ static int bcm_proc_show(struct seq_file *m, void *v)
 {
        char ifname[IFNAMSIZ];
        struct net *net = m->private;
-       struct sock *sk = (struct sock *)PDE_DATA(m->file->f_inode);
+       struct sock *sk = (struct sock *)pde_data(m->file->f_inode);
        struct bcm_sock *bo = bcm_sk(sk);
        struct bcm_op *op;
 

diff --git a/net/can/proc.c b/net/can/proc.c
index b3099f0a3cb824772e21f7c4bc0c2d1392669dee..bbce97825f13fbf725261e572271a9353d51897d 100644 (file)
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -305,7 +305,7 @@ static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx,
 static int can_rcvlist_proc_show(struct seq_file *m, void *v)
 {
        /* double cast to prevent GCC warning */
-       int idx = (int)(long)PDE_DATA(m->file->f_inode);
+       int idx = (int)(long)pde_data(m->file->f_inode);
        struct net_device *dev;
        struct can_dev_rcv_lists *dev_rcv_lists;
        struct net *net = m->private;

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 213cb7b26b7a6ffce3ccb312690f77fdac49a501..6c2016f7f3d19e29ade746253e75d14aa3da1269 100644 (file)
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -3364,7 +3364,7 @@ EXPORT_SYMBOL(neigh_seq_stop);
 
 static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       struct neigh_table *tbl = PDE_DATA(file_inode(seq->file));
+       struct neigh_table *tbl = pde_data(file_inode(seq->file));
        int cpu;
 
        if (*pos == 0)
@@ -3381,7 +3381,7 @@ static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       struct neigh_table *tbl = PDE_DATA(file_inode(seq->file));
+       struct neigh_table *tbl = pde_data(file_inode(seq->file));
        int cpu;
 
        for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {
@@ -3401,7 +3401,7 @@ static void neigh_stat_seq_stop(struct seq_file *seq, void *v)
 
 static int neigh_stat_seq_show(struct seq_file *seq, void *v)
 {
-       struct neigh_table *tbl = PDE_DATA(file_inode(seq->file));
+       struct neigh_table *tbl = pde_data(file_inode(seq->file));
        struct neigh_statistics *st = v;
 
        if (v == SEQ_START_TOKEN) {

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 560a5e712dc32fe4aa2cfaa751c3fe1e462c614f..84b62cd7bc57a96c04622e99c8a48cc5b03d1b66 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -546,7 +546,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,
 
 static int pgctrl_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, pgctrl_show, PDE_DATA(inode));
+       return single_open(file, pgctrl_show, pde_data(inode));
 }
 
 static const struct proc_ops pktgen_proc_ops = {
@@ -1811,7 +1811,7 @@ static ssize_t pktgen_if_write(struct file *file,
 
 static int pktgen_if_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, pktgen_if_show, PDE_DATA(inode));
+       return single_open(file, pktgen_if_show, pde_data(inode));
 }
 
 static const struct proc_ops pktgen_if_proc_ops = {
@@ -1948,7 +1948,7 @@ out:
 
 static int pktgen_thread_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, pktgen_thread_show, PDE_DATA(inode));
+       return single_open(file, pktgen_thread_show, pde_data(inode));
 }
 
 static const struct proc_ops pktgen_thread_proc_ops = {

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index b518f20c9a244df13147ee4835cbe6251ed6026d..f8e176c77d1c1e177bb374379e24fabe2040fc5d 100644 (file)
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -776,7 +776,7 @@ static int clusterip_proc_open(struct inode *inode, struct file *file)
 
        if (!ret) {
                struct seq_file *sf = file->private_data;
-               struct clusterip_config *c = PDE_DATA(inode);
+               struct clusterip_config *c = pde_data(inode);
 
                sf->private = c;
 
@@ -788,7 +788,7 @@ static int clusterip_proc_open(struct inode *inode, struct file *file)
 
 static int clusterip_proc_release(struct inode *inode, struct file *file)
 {
-       struct clusterip_config *c = PDE_DATA(inode);
+       struct clusterip_config *c = pde_data(inode);
        int ret;
 
        ret = seq_release(inode, file);
@@ -802,7 +802,7 @@ static int clusterip_proc_release(struct inode *inode, struct file *file)
 static ssize_t clusterip_proc_write(struct file *file, const char __user *input,
                                size_t size, loff_t *ofs)
 {
-       struct clusterip_config *c = PDE_DATA(file_inode(file));
+       struct clusterip_config *c = pde_data(file_inode(file));
 #define PROC_WRITELEN  10
        char buffer[PROC_WRITELEN+1];
        unsigned long nodenum;

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index a53f256bf9d39157021f84ce395fa1a0b9fb46ab..9eb5fc2478687c417cfbd8c95cbd41c6f613e868 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -971,7 +971,7 @@ struct proto raw_prot = {
 static struct sock *raw_get_first(struct seq_file *seq)
 {
        struct sock *sk;
-       struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
+       struct raw_hashinfo *h = pde_data(file_inode(seq->file));
        struct raw_iter_state *state = raw_seq_private(seq);
 
        for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
@@ -987,7 +987,7 @@ found:
 
 static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
 {
-       struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
+       struct raw_hashinfo *h = pde_data(file_inode(seq->file));
        struct raw_iter_state *state = raw_seq_private(seq);
 
        do {
@@ -1016,7 +1016,7 @@ static struct sock *raw_get_idx(struct seq_file *seq, loff_t pos)
 void *raw_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(&h->lock)
 {
-       struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
+       struct raw_hashinfo *h = pde_data(file_inode(seq->file));
 
        read_lock(&h->lock);
        return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
@@ -1039,7 +1039,7 @@ EXPORT_SYMBOL_GPL(raw_seq_next);
 void raw_seq_stop(struct seq_file *seq, void *v)
        __releases(&h->lock)
 {
-       struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
+       struct raw_hashinfo *h = pde_data(file_inode(seq->file));
 
        read_unlock(&h->lock);
 }

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b3f34e366b27f7f1aece164aa485b1e9a7248d93..b53476e78c84f2b5d7cd9a04e0d947961f1f0495 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -3002,7 +3002,7 @@ static unsigned short seq_file_family(const struct seq_file *seq)
 #endif
 
        /* Iterated from proc fs */
-       afinfo = PDE_DATA(file_inode(seq->file));
+       afinfo = pde_data(file_inode(seq->file));
        return afinfo->family;
 }
 

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 464590ea922e153e3391ce8f9601c0bb63aae4f2..090360939401e60d7844f18b3fd2fb283bdc2b5e 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2960,7 +2960,7 @@ static struct sock *udp_get_first(struct seq_file *seq, int start)
        if (state->bpf_seq_afinfo)
                afinfo = state->bpf_seq_afinfo;
        else
-               afinfo = PDE_DATA(file_inode(seq->file));
+               afinfo = pde_data(file_inode(seq->file));
 
        for (state->bucket = start; state->bucket <= afinfo->udp_table->mask;
             ++state->bucket) {
@@ -2993,7 +2993,7 @@ static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk)
        if (state->bpf_seq_afinfo)
                afinfo = state->bpf_seq_afinfo;
        else
-               afinfo = PDE_DATA(file_inode(seq->file));
+               afinfo = pde_data(file_inode(seq->file));
 
        do {
                sk = sk_next(sk);
@@ -3050,7 +3050,7 @@ void udp_seq_stop(struct seq_file *seq, void *v)
        if (state->bpf_seq_afinfo)
                afinfo = state->bpf_seq_afinfo;
        else
-               afinfo = PDE_DATA(file_inode(seq->file));
+               afinfo = pde_data(file_inode(seq->file));
 
        if (state->bucket <= afinfo->udp_table->mask)
                spin_unlock_bh(&afinfo->udp_table->hash[state->bucket].lock);

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 25524e3933496098f68748286e56839454ee842c..54a489f16b171220aaffef3ea43355fd89cd91ce 100644 (file)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -1517,7 +1517,7 @@ EXPORT_SYMBOL_GPL(xt_unregister_table);
 #ifdef CONFIG_PROC_FS
 static void *xt_table_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       u8 af = (unsigned long)PDE_DATA(file_inode(seq->file));
+       u8 af = (unsigned long)pde_data(file_inode(seq->file));
        struct net *net = seq_file_net(seq);
        struct xt_pernet *xt_net;
 
@@ -1529,7 +1529,7 @@ static void *xt_table_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *xt_table_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       u8 af = (unsigned long)PDE_DATA(file_inode(seq->file));
+       u8 af = (unsigned long)pde_data(file_inode(seq->file));
        struct net *net = seq_file_net(seq);
        struct xt_pernet *xt_net;
 
@@ -1540,7 +1540,7 @@ static void *xt_table_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 
 static void xt_table_seq_stop(struct seq_file *seq, void *v)
 {
-       u_int8_t af = (unsigned long)PDE_DATA(file_inode(seq->file));
+       u_int8_t af = (unsigned long)pde_data(file_inode(seq->file));
 
        mutex_unlock(&xt[af].mutex);
 }
@@ -1584,7 +1584,7 @@ static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos,
                [MTTG_TRAV_NFP_UNSPEC] = MTTG_TRAV_NFP_SPEC,
                [MTTG_TRAV_NFP_SPEC]   = MTTG_TRAV_DONE,
        };
-       uint8_t nfproto = (unsigned long)PDE_DATA(file_inode(seq->file));
+       uint8_t nfproto = (unsigned long)pde_data(file_inode(seq->file));
        struct nf_mttg_trav *trav = seq->private;
 
        if (ppos != NULL)
@@ -1633,7 +1633,7 @@ static void *xt_mttg_seq_start(struct seq_file *seq, loff_t *pos,
 
 static void xt_mttg_seq_stop(struct seq_file *seq, void *v)
 {
-       uint8_t nfproto = (unsigned long)PDE_DATA(file_inode(seq->file));
+       uint8_t nfproto = (unsigned long)pde_data(file_inode(seq->file));
        struct nf_mttg_trav *trav = seq->private;
 
        switch (trav->class) {

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 9c5cfd74a0ee488e9e996c8892cf9e08ddcdc1c3..0859b8f767645c7562f1688850e73a199e5608aa 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -1052,7 +1052,7 @@ static struct xt_match hashlimit_mt_reg[] __read_mostly = {
 static void *dl_seq_start(struct seq_file *s, loff_t *pos)
        __acquires(htable->lock)
 {
-       struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *htable = pde_data(file_inode(s->file));
        unsigned int *bucket;
 
        spin_lock_bh(&htable->lock);
@@ -1069,7 +1069,7 @@ static void *dl_seq_start(struct seq_file *s, loff_t *pos)
 
 static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
-       struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *htable = pde_data(file_inode(s->file));
        unsigned int *bucket = v;
 
        *pos = ++(*bucket);
@@ -1083,7 +1083,7 @@ static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)
 static void dl_seq_stop(struct seq_file *s, void *v)
        __releases(htable->lock)
 {
-       struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *htable = pde_data(file_inode(s->file));
        unsigned int *bucket = v;
 
        if (!IS_ERR(bucket))
@@ -1125,7 +1125,7 @@ static void dl_seq_print(struct dsthash_ent *ent, u_int8_t family,
 static int dl_seq_real_show_v2(struct dsthash_ent *ent, u_int8_t family,
                               struct seq_file *s)
 {
-       struct xt_hashlimit_htable *ht = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *ht = pde_data(file_inode(s->file));
 
        spin_lock(&ent->lock);
        /* recalculate to show accurate numbers */
@@ -1140,7 +1140,7 @@ static int dl_seq_real_show_v2(struct dsthash_ent *ent, u_int8_t family,
 static int dl_seq_real_show_v1(struct dsthash_ent *ent, u_int8_t family,
                               struct seq_file *s)
 {
-       struct xt_hashlimit_htable *ht = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *ht = pde_data(file_inode(s->file));
 
        spin_lock(&ent->lock);
        /* recalculate to show accurate numbers */
@@ -1155,7 +1155,7 @@ static int dl_seq_real_show_v1(struct dsthash_ent *ent, u_int8_t family,
 static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
                            struct seq_file *s)
 {
-       struct xt_hashlimit_htable *ht = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *ht = pde_data(file_inode(s->file));
 
        spin_lock(&ent->lock);
        /* recalculate to show accurate numbers */
@@ -1169,7 +1169,7 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
 
 static int dl_seq_show_v2(struct seq_file *s, void *v)
 {
-       struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *htable = pde_data(file_inode(s->file));
        unsigned int *bucket = (unsigned int *)v;
        struct dsthash_ent *ent;
 
@@ -1183,7 +1183,7 @@ static int dl_seq_show_v2(struct seq_file *s, void *v)
 
 static int dl_seq_show_v1(struct seq_file *s, void *v)
 {
-       struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *htable = pde_data(file_inode(s->file));
        unsigned int *bucket = v;
        struct dsthash_ent *ent;
 
@@ -1197,7 +1197,7 @@ static int dl_seq_show_v1(struct seq_file *s, void *v)
 
 static int dl_seq_show(struct seq_file *s, void *v)
 {
-       struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->file));
+       struct xt_hashlimit_htable *htable = pde_data(file_inode(s->file));
        unsigned int *bucket = v;
        struct dsthash_ent *ent;
 

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index 0446307516cdff3b9f219808b95a8a241a82e29b..7ddb9a78e3fc888d3ee4c214870ae8c84171efe7 100644 (file)
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -551,7 +551,7 @@ static int recent_seq_open(struct inode *inode, struct file *file)
        if (st == NULL)
                return -ENOMEM;
 
-       st->table    = PDE_DATA(inode);
+       st->table    = pde_data(inode);
        return 0;
 }
 
@@ -559,7 +559,7 @@ static ssize_t
 recent_mt_proc_write(struct file *file, const char __user *input,
                     size_t size, loff_t *loff)
 {
-       struct recent_table *t = PDE_DATA(file_inode(file));
+       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;

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index b87565b64928d4d6bbb253890109a745c2bd92ee..c2ba9d4cd2c777a212c45a0c51fd541214597a06 100644 (file)
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1433,7 +1433,7 @@ static bool use_gss_proxy(struct net *net)
 static ssize_t write_gssp(struct file *file, const char __user *buf,
                         size_t count, loff_t *ppos)
 {
-       struct net *net = PDE_DATA(file_inode(file));
+       struct net *net = pde_data(file_inode(file));
        char tbuf[20];
        unsigned long i;
        int res;
@@ -1461,7 +1461,7 @@ static ssize_t write_gssp(struct file *file, const char __user *buf,
 static ssize_t read_gssp(struct file *file, char __user *buf,
                         size_t count, loff_t *ppos)
 {
-       struct net *net = PDE_DATA(file_inode(file));
+       struct net *net = pde_data(file_inode(file));
        struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
        unsigned long p = *ppos;
        char tbuf[10];

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 59641803472c69e63aae99349ccb6b44712d00c7..bb1177395b99db6bc02dfec6ffd5e5430299d681 100644 (file)
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1536,7 +1536,7 @@ static ssize_t write_flush(struct file *file, const char __user *buf,
 static ssize_t cache_read_procfs(struct file *filp, char __user *buf,
                                 size_t count, loff_t *ppos)
 {
-       struct cache_detail *cd = PDE_DATA(file_inode(filp));
+       struct cache_detail *cd = pde_data(file_inode(filp));
 
        return cache_read(filp, buf, count, ppos, cd);
 }
@@ -1544,14 +1544,14 @@ static ssize_t cache_read_procfs(struct file *filp, char __user *buf,
 static ssize_t cache_write_procfs(struct file *filp, const char __user *buf,
                                  size_t count, loff_t *ppos)
 {
-       struct cache_detail *cd = PDE_DATA(file_inode(filp));
+       struct cache_detail *cd = pde_data(file_inode(filp));
 
        return cache_write(filp, buf, count, ppos, cd);
 }
 
 static __poll_t cache_poll_procfs(struct file *filp, poll_table *wait)
 {
-       struct cache_detail *cd = PDE_DATA(file_inode(filp));
+       struct cache_detail *cd = pde_data(file_inode(filp));
 
        return cache_poll(filp, wait, cd);
 }
@@ -1560,21 +1560,21 @@ static long cache_ioctl_procfs(struct file *filp,
                               unsigned int cmd, unsigned long arg)
 {
        struct inode *inode = file_inode(filp);
-       struct cache_detail *cd = PDE_DATA(inode);
+       struct cache_detail *cd = pde_data(inode);
 
        return cache_ioctl(inode, filp, cmd, arg, cd);
 }
 
 static int cache_open_procfs(struct inode *inode, struct file *filp)
 {
-       struct cache_detail *cd = PDE_DATA(inode);
+       struct cache_detail *cd = pde_data(inode);
 
        return cache_open(inode, filp, cd);
 }
 
 static int cache_release_procfs(struct inode *inode, struct file *filp)
 {
-       struct cache_detail *cd = PDE_DATA(inode);
+       struct cache_detail *cd = pde_data(inode);
 
        return cache_release(inode, filp, cd);
 }
@@ -1591,14 +1591,14 @@ static const struct proc_ops cache_channel_proc_ops = {
 
 static int content_open_procfs(struct inode *inode, struct file *filp)
 {
-       struct cache_detail *cd = PDE_DATA(inode);
+       struct cache_detail *cd = pde_data(inode);
 
        return content_open(inode, filp, cd);
 }
 
 static int content_release_procfs(struct inode *inode, struct file *filp)
 {
-       struct cache_detail *cd = PDE_DATA(inode);
+       struct cache_detail *cd = pde_data(inode);
 
        return content_release(inode, filp, cd);
 }
@@ -1612,14 +1612,14 @@ static const struct proc_ops content_proc_ops = {
 
 static int open_flush_procfs(struct inode *inode, struct file *filp)
 {
-       struct cache_detail *cd = PDE_DATA(inode);
+       struct cache_detail *cd = pde_data(inode);
 
        return open_flush(inode, filp, cd);
 }
 
 static int release_flush_procfs(struct inode *inode, struct file *filp)
 {
-       struct cache_detail *cd = PDE_DATA(inode);
+       struct cache_detail *cd = pde_data(inode);
 
        return release_flush(inode, filp, cd);
 }
@@ -1627,7 +1627,7 @@ static int release_flush_procfs(struct inode *inode, struct file *filp)
 static ssize_t read_flush_procfs(struct file *filp, char __user *buf,
                            size_t count, loff_t *ppos)
 {
-       struct cache_detail *cd = PDE_DATA(file_inode(filp));
+       struct cache_detail *cd = pde_data(file_inode(filp));
 
        return read_flush(filp, buf, count, ppos, cd);
 }
@@ -1636,7 +1636,7 @@ static ssize_t write_flush_procfs(struct file *filp,
                                  const char __user *buf,
                                  size_t count, loff_t *ppos)
 {
-       struct cache_detail *cd = PDE_DATA(file_inode(filp));
+       struct cache_detail *cd = pde_data(file_inode(filp));
 
        return write_flush(filp, buf, count, ppos, cd);
 }

diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index c964b48eaabae495f6896a8658312bfc18f48769..52908f9e6eab54572f6852d725daef152163a77d 100644 (file)
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -66,7 +66,7 @@ static int rpc_proc_show(struct seq_file *seq, void *v) {
 
 static int rpc_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, rpc_proc_show, PDE_DATA(inode));
+       return single_open(file, rpc_proc_show, pde_data(inode));
 }
 
 static const struct proc_ops rpc_proc_ops = {

diff --git a/sound/core/info.c b/sound/core/info.c
index a451b24199c3ee66a0a28a0aedd3240d015c6b1b..782fba87cc043a156427d6c5500b13a63da9fe06 100644 (file)
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -234,7 +234,7 @@ static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
 
 static int snd_info_entry_open(struct inode *inode, struct file *file)
 {
-       struct snd_info_entry *entry = PDE_DATA(inode);
+       struct snd_info_entry *entry = pde_data(inode);
        struct snd_info_private_data *data;
        int mode, err;
 
@@ -365,7 +365,7 @@ static int snd_info_seq_show(struct seq_file *seq, void *p)
 
 static int snd_info_text_entry_open(struct inode *inode, struct file *file)
 {
-       struct snd_info_entry *entry = PDE_DATA(inode);
+       struct snd_info_entry *entry = pde_data(inode);
        struct snd_info_private_data *data;
        int err;