Skip to content

Commit

Permalink
[PATCH] struct path: convert infiniband
Browse files Browse the repository at this point in the history 
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Josef Sipek authored and Linus Torvalds committed Dec 8, 2006
1 parent 4db6108 commit 1cfd6e6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions drivers/infiniband/core/uverbs_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,9 @@ struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file,
* module reference.
*/
filp->f_op = fops_get(&uverbs_event_fops);
filp->f_vfsmnt = mntget(uverbs_event_mnt);
filp->f_dentry = dget(uverbs_event_mnt->mnt_root);
filp->f_mapping = filp->f_dentry->d_inode->i_mapping;
filp->f_path.mnt = mntget(uverbs_event_mnt);
filp->f_path.dentry = dget(uverbs_event_mnt->mnt_root);
filp->f_mapping = filp->f_path.dentry->d_inode->i_mapping;
filp->f_flags = O_RDONLY;
filp->f_mode = FMODE_READ;
filp->private_data = ev_file;
Expand Down
4 changes: 2 additions & 2 deletions drivers/infiniband/hw/ipath/ipath_file_ops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1745,9 +1745,9 @@ static int ipath_assign_port(struct file *fp,
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",
(long)fp->f_dentry->d_inode->i_rdev, i_minor);
(long)fp->f_path.dentry->d_inode->i_rdev, i_minor);

if (i_minor)
ret = find_free_port(i_minor - 1, fp, uinfo);
Expand Down
10 changes: 5 additions & 5 deletions drivers/infiniband/hw/ipath/ipath_fs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
u16 i;
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++)
counters[i] = ipath_snap_cntr(dd, i);
Expand All @@ -138,7 +138,7 @@ static ssize_t atomic_node_info_read(struct file *file, char __user *buf,
struct ipath_devdata *dd;
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);

Expand Down Expand Up @@ -177,7 +177,7 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
u32 tmp, tmp2;
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. */
memset(portinfo, 0, sizeof portinfo);
Expand Down Expand Up @@ -324,7 +324,7 @@ static ssize_t flash_read(struct file *file, char __user *buf,
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)) {
ipath_dev_err(dd, "failed to read from flash\n");
ret = -ENXIO;
Expand Down Expand Up @@ -377,7 +377,7 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
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)) {
ret = -ENXIO;
ipath_dev_err(dd, "failed to write to flash\n");
Expand Down

0 comments on commit 1cfd6e6

Please sign in to comment.