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

Commit 496ad9aa authored by Al Viro's avatar Al Viro
Browse files

new helper: file_inode(file) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 57eccb83

arch/alpha/kernel/srm_env.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer, 
				  size_t count, loff_t *pos)

{

	int res;

	srm_env_t	*entry = PDE(file->f_path.dentry->d_inode)->data;

	srm_env_t	*entry = PDE(file_inode(file))->data;

	char		*buf = (char *) __get_free_page(GFP_USER);

	unsigned long	ret1, ret2;

arch/blackfin/kernel/cplbinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static const struct seq_operations cplbinfo_sops = { 


static int cplbinfo_open(struct inode *inode, struct file *file)

{

	struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);

	struct proc_dir_entry *pde = PDE(file_inode(file));

	char cplb_type;

	unsigned int cpu;

	int ret;

arch/cris/arch-v10/drivers/sync_serial.c

+4 −4
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int sync_serial_release(struct inode *inode, struct file *file) 


static unsigned int sync_serial_poll(struct file *file, poll_table *wait)

{

	int dev = MINOR(file->f_dentry->d_inode->i_rdev);

	int dev = MINOR(file_inode(file)->i_rdev);

	unsigned int mask = 0;

	struct sync_port *port;

	DEBUGPOLL(static unsigned int prev_mask = 0);
@@ -685,7 +685,7 @@ static int sync_serial_ioctl_unlocked(struct file *file, 
	int return_val = 0;

	unsigned long flags;



	int dev = MINOR(file->f_dentry->d_inode->i_rdev);

	int dev = MINOR(file_inode(file)->i_rdev);

	struct sync_port *port;



	if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled) {
@@ -973,7 +973,7 @@ static long sync_serial_ioctl(struct file *file, 
static ssize_t sync_serial_write(struct file *file, const char *buf,

	size_t count, loff_t *ppos)

{

	int dev = MINOR(file->f_dentry->d_inode->i_rdev);

	int dev = MINOR(file_inode(file)->i_rdev);

	DECLARE_WAITQUEUE(wait, current);

	struct sync_port *port;

	unsigned long flags;
@@ -1097,7 +1097,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf, 
static ssize_t sync_serial_read(struct file *file, char *buf,

				size_t count, loff_t *ppos)

{

	int dev = MINOR(file->f_dentry->d_inode->i_rdev);

	int dev = MINOR(file_inode(file)->i_rdev);

	int avail;

	struct sync_port *port;

	unsigned char *start;

arch/cris/arch-v32/drivers/cryptocop.c

+1 −2
Original line number Diff line number Diff line
@@ -3135,11 +3135,10 @@ static long cryptocop_ioctl_unlocked(struct inode *inode, 
static long

cryptocop_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

       struct inode *inode = file->f_path.dentry->d_inode;

       long ret;



       mutex_lock(&cryptocop_mutex);

       ret = cryptocop_ioctl_unlocked(inode, filp, cmd, arg);

       ret = cryptocop_ioctl_unlocked(file_inode(filp), filp, cmd, arg);

       mutex_unlock(&cryptocop_mutex);



       return ret;

arch/cris/arch-v32/drivers/sync_serial.c

+4 −4
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ static int sync_serial_release(struct inode *inode, struct file *file) 


static unsigned int sync_serial_poll(struct file *file, poll_table *wait)

{

	int dev = iminor(file->f_path.dentry->d_inode);

	int dev = iminor(file_inode(file));

	unsigned int mask = 0;

	sync_port *port;

	DEBUGPOLL( static unsigned int prev_mask = 0; );
@@ -657,7 +657,7 @@ static int sync_serial_ioctl(struct file *file, 
{

	int return_val = 0;

	int dma_w_size = regk_dma_set_w_size1;

	int dev = iminor(file->f_path.dentry->d_inode);

	int dev = iminor(file_inode(file));

	sync_port *port;

	reg_sser_rw_tr_cfg tr_cfg;

	reg_sser_rw_rec_cfg rec_cfg;
@@ -979,7 +979,7 @@ static long sync_serial_ioctl(struct file *file, 
static ssize_t sync_serial_write(struct file *file, const char *buf,

				 size_t count, loff_t *ppos)

{

	int dev = iminor(file->f_path.dentry->d_inode);

	int dev = iminor(file_inode(file));

	DECLARE_WAITQUEUE(wait, current);

	struct sync_port *port;

	int trunc_count;
@@ -1102,7 +1102,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf, 
static ssize_t sync_serial_read(struct file * file, char * buf,

				size_t count, loff_t *ppos)

{

	int dev = iminor(file->f_path.dentry->d_inode);

	int dev = iminor(file_inode(file));

	int avail;

	sync_port *port;

	unsigned char* start;