procfs: new helper - PDE_DATA(inode)
The only part of proc_dir_entry the code outside of fs/proc really cares about is PDE(inode)->data. Provide a helper for that; static inline for now, eventually will be moved to fs/proc, along with the knowledge of struct proc_dir_entry layout. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -4663,8 +4663,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *apriv = dev->ml_priv;
|
||||
CapabilityRid cap_rid;
|
||||
StatusRid status_rid;
|
||||
@@ -4746,8 +4745,7 @@ static int proc_stats_rid_open( struct inode *inode,
|
||||
u16 rid )
|
||||
{
|
||||
struct proc_data *data;
|
||||
struct proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *apriv = dev->ml_priv;
|
||||
StatsRid stats;
|
||||
int i, j;
|
||||
@@ -4809,8 +4807,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
char *line;
|
||||
|
||||
@@ -5021,8 +5018,7 @@ static const char *get_rmode(__le16 mode)
|
||||
static int proc_config_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct proc_data *data;
|
||||
struct proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
int i;
|
||||
__le16 mode;
|
||||
@@ -5112,8 +5108,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
SsidRid SSID_rid;
|
||||
int i;
|
||||
@@ -5148,8 +5143,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
APListRid APList_rid;
|
||||
int i;
|
||||
@@ -5283,8 +5277,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
int i, rc;
|
||||
char key[16];
|
||||
@@ -5335,8 +5328,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
char *ptr;
|
||||
WepKeyRid wkr;
|
||||
@@ -5384,8 +5376,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
int i;
|
||||
char *ptr;
|
||||
@@ -5428,8 +5419,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
int i;
|
||||
char *ptr;
|
||||
@@ -5468,8 +5458,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 proc_dir_entry *dp = PDE(inode);
|
||||
struct net_device *dev = dp->data;
|
||||
struct net_device *dev = PDE_DATA(inode);
|
||||
struct airo_info *ai = dev->ml_priv;
|
||||
char *ptr;
|
||||
BSSListRid BSSList_rid;
|
||||
|
Reference in New Issue
Block a user