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

Commit 1cfd6e64 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert infiniband 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4db61081

drivers/infiniband/core/uverbs_main.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -534,9 +534,9 @@ struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file, 
	 * module reference.

	 * module reference.

	 */

	 */

	filp->f_op 	   = fops_get(&uverbs_event_fops);

	filp->f_op 	   = fops_get(&uverbs_event_fops);

	filp->f_vfsmnt 	   = mntget(uverbs_event_mnt);

	filp->f_path.mnt 	   = mntget(uverbs_event_mnt);

	filp->f_dentry 	   = dget(uverbs_event_mnt->mnt_root);

	filp->f_path.dentry 	   = dget(uverbs_event_mnt->mnt_root);

	filp->f_mapping    = filp->f_dentry->d_inode->i_mapping;

	filp->f_mapping    = filp->f_path.dentry->d_inode->i_mapping;

	filp->f_flags      = O_RDONLY;

	filp->f_flags      = O_RDONLY;

	filp->f_mode       = FMODE_READ;

	filp->f_mode       = FMODE_READ;

	filp->private_data = ev_file;

	filp->private_data = ev_file;

drivers/infiniband/hw/ipath/ipath_file_ops.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1745,9 +1745,9 @@ static int ipath_assign_port(struct file *fp, 
		goto done;

		goto done;

	}

	}





	i_minor = iminor(fp->f_dentry->d_inode) - IPATH_USER_MINOR_BASE;

	i_minor = iminor(fp->f_path.dentry->d_inode) - IPATH_USER_MINOR_BASE;

	ipath_cdbg(VERBOSE, "open on dev %lx (minor %d)\n",

	ipath_cdbg(VERBOSE, "open on dev %lx (minor %d)\n",

		   (long)fp->f_dentry->d_inode->i_rdev, i_minor);

		   (long)fp->f_path.dentry->d_inode->i_rdev, i_minor);





	if (i_minor)

	if (i_minor)

		ret = find_free_port(i_minor - 1, fp, uinfo);

		ret = find_free_port(i_minor - 1, fp, uinfo);

drivers/infiniband/hw/ipath/ipath_fs.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf, 
	u16 i;

	u16 i;

	struct ipath_devdata *dd;

	struct ipath_devdata *dd;





	dd = file->f_dentry->d_inode->i_private;

	dd = file->f_path.dentry->d_inode->i_private;





	for (i = 0; i < NUM_COUNTERS; i++)

	for (i = 0; i < NUM_COUNTERS; i++)

		counters[i] = ipath_snap_cntr(dd, i);

		counters[i] = ipath_snap_cntr(dd, i);
@@ -138,7 +138,7 @@ static ssize_t atomic_node_info_read(struct file *file, char __user *buf, 
	struct ipath_devdata *dd;

	struct ipath_devdata *dd;

	u64 guid;

	u64 guid;





	dd = file->f_dentry->d_inode->i_private;

	dd = file->f_path.dentry->d_inode->i_private;





	guid = be64_to_cpu(dd->ipath_guid);

	guid = be64_to_cpu(dd->ipath_guid);
@@ -177,7 +177,7 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf, 
	u32 tmp, tmp2;

	u32 tmp, tmp2;

	struct ipath_devdata *dd;

	struct ipath_devdata *dd;





	dd = file->f_dentry->d_inode->i_private;

	dd = file->f_path.dentry->d_inode->i_private;





	/* so we only initialize non-zero fields. */

	/* so we only initialize non-zero fields. */

	memset(portinfo, 0, sizeof portinfo);

	memset(portinfo, 0, sizeof portinfo);
@@ -324,7 +324,7 @@ static ssize_t flash_read(struct file *file, char __user *buf, 
		goto bail;

		goto bail;

	}

	}





	dd = file->f_dentry->d_inode->i_private;

	dd = file->f_path.dentry->d_inode->i_private;

	if (ipath_eeprom_read(dd, pos, tmp, count)) {

	if (ipath_eeprom_read(dd, pos, tmp, count)) {

		ipath_dev_err(dd, "failed to read from flash\n");

		ipath_dev_err(dd, "failed to read from flash\n");

		ret = -ENXIO;

		ret = -ENXIO;
@@ -377,7 +377,7 @@ static ssize_t flash_write(struct file *file, const char __user *buf, 
		goto bail_tmp;

		goto bail_tmp;

	}

	}





	dd = file->f_dentry->d_inode->i_private;

	dd = file->f_path.dentry->d_inode->i_private;

	if (ipath_eeprom_write(dd, pos, tmp, count)) {

	if (ipath_eeprom_write(dd, pos, tmp, count)) {

		ret = -ENXIO;

		ret = -ENXIO;

		ipath_dev_err(dd, "failed to write to flash\n");

		ipath_dev_err(dd, "failed to write to flash\n");