Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d81b1c authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

VFS: Fix up some ->d_inode accesses in the chelsio driver 



Fix up some ->d_inode accesses in the chelsio driver.

 (1) FILE_DATA() should just be replaced with file_inode().

 (2) set_debugfs_file_size() should be removed and debugfs_create_file_size()
     should be used to create the file.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5153bc81

drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c

+7 −14
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static ssize_t tp_la_write(struct file *file, const char __user *buf, 
	char s[32];

	unsigned long val;

	size_t size = min(sizeof(s) - 1, count);

	struct adapter *adap = FILE_DATA(file)->i_private;

	struct adapter *adap = file_inode(file)->i_private;



	if (copy_from_user(s, buf, size))

		return -EFAULT;
@@ -647,7 +647,7 @@ static int pm_stats_open(struct inode *inode, struct file *file) 
static ssize_t pm_stats_clear(struct file *file, const char __user *buf,

			      size_t count, loff_t *pos)

{

	struct adapter *adap = FILE_DATA(file)->i_private;

	struct adapter *adap = file_inode(file)->i_private;



	t4_write_reg(adap, PM_RX_STAT_CONFIG_A, 0);

	t4_write_reg(adap, PM_TX_STAT_CONFIG_A, 0);
@@ -1005,7 +1005,7 @@ static ssize_t mbox_write(struct file *file, const char __user *buf, 
		   &data[7], &c) < 8 || c != '\n')

		return -EINVAL;



	ino = FILE_DATA(file);

	ino = file_inode(file);

	mbox = (uintptr_t)ino->i_private & 7;

	adap = ino->i_private - mbox;

	addr = adap->regs + PF_REG(mbox, CIM_PF_MAILBOX_DATA_A);
@@ -1034,7 +1034,7 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t count, 
			  loff_t *ppos)

{

	loff_t pos = *ppos;

	loff_t avail = FILE_DATA(file)->i_size;

	loff_t avail = file_inode(file)->i_size;

	struct adapter *adap = file->private_data;



	if (pos < 0)
@@ -1479,7 +1479,7 @@ static ssize_t rss_key_write(struct file *file, const char __user *buf, 
	int i, j;

	u32 key[10];

	char s[100], *p;

	struct adapter *adap = FILE_DATA(file)->i_private;

	struct adapter *adap = file_inode(file)->i_private;



	if (count > sizeof(s) - 1)

		return -EINVAL;
@@ -1951,12 +1951,6 @@ static const struct file_operations mem_debugfs_fops = { 
	.llseek  = default_llseek,

};



static void set_debugfs_file_size(struct dentry *de, loff_t size)

{

	if (!IS_ERR(de) && de->d_inode)

		de->d_inode->i_size = size;

}



static void add_debugfs_mem(struct adapter *adap, const char *name,

			    unsigned int idx, unsigned int size_mb)

{
@@ -2072,9 +2066,8 @@ int t4_setup_debugfs(struct adapter *adap) 
		}

	}



	de = debugfs_create_file("flash", S_IRUSR, adap->debugfs_root, adap,

				 &flash_debugfs_fops);

	set_debugfs_file_size(de, adap->params.sf_size);

	de = debugfs_create_file_size("flash", S_IRUSR, adap->debugfs_root, adap,

				      &flash_debugfs_fops, adap->params.sf_size);



	return 0;

}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 


#include <linux/export.h>



#define FILE_DATA(_file) ((_file)->f_path.dentry->d_inode)



#define DEFINE_SIMPLE_DEBUGFS_FILE(name) \

static int name##_open(struct inode *inode, struct file *file) \

{ \