mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 16:30:53 +07:00
[PATCH] struct path: convert ia64
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>
This commit is contained in:
parent
cba0a12843
commit
b66ffad904
@ -235,7 +235,7 @@ mmap_subpage (struct file *file, unsigned long start, unsigned long end, int pro
|
||||
|
||||
if (!(flags & MAP_ANONYMOUS)) {
|
||||
/* read the file contents */
|
||||
inode = file->f_dentry->d_inode;
|
||||
inode = file->f_path.dentry->d_inode;
|
||||
if (!inode->i_fop || !file->f_op->read
|
||||
|| ((*file->f_op->read)(file, (char __user *) start, end - start, &off) < 0))
|
||||
{
|
||||
@ -837,7 +837,7 @@ emulate_mmap (struct file *file, unsigned long start, unsigned long len, int pro
|
||||
|
||||
if (!is_congruent) {
|
||||
/* read the file contents */
|
||||
inode = file->f_dentry->d_inode;
|
||||
inode = file->f_path.dentry->d_inode;
|
||||
if (!inode->i_fop || !file->f_op->read
|
||||
|| ((*file->f_op->read)(file, (char __user *) pstart, pend - pstart, &poff)
|
||||
< 0))
|
||||
|
@ -2188,13 +2188,13 @@ pfm_alloc_fd(struct file **cfile)
|
||||
/*
|
||||
* allocate a new dcache entry
|
||||
*/
|
||||
file->f_dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
|
||||
if (!file->f_dentry) goto out;
|
||||
file->f_path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
|
||||
if (!file->f_path.dentry) goto out;
|
||||
|
||||
file->f_dentry->d_op = &pfmfs_dentry_operations;
|
||||
file->f_path.dentry->d_op = &pfmfs_dentry_operations;
|
||||
|
||||
d_add(file->f_dentry, inode);
|
||||
file->f_vfsmnt = mntget(pfmfs_mnt);
|
||||
d_add(file->f_path.dentry, inode);
|
||||
file->f_path.mnt = mntget(pfmfs_mnt);
|
||||
file->f_mapping = inode->i_mapping;
|
||||
|
||||
file->f_op = &pfm_file_ops;
|
||||
|
@ -302,7 +302,7 @@ salinfo_event_open(struct inode *inode, struct file *file)
|
||||
static ssize_t
|
||||
salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
|
||||
{
|
||||
struct inode *inode = file->f_dentry->d_inode;
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
struct proc_dir_entry *entry = PDE(inode);
|
||||
struct salinfo_data *data = entry->data;
|
||||
char cmd[32];
|
||||
@ -464,7 +464,7 @@ salinfo_log_new_read(int cpu, struct salinfo_data *data)
|
||||
static ssize_t
|
||||
salinfo_log_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
|
||||
{
|
||||
struct inode *inode = file->f_dentry->d_inode;
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
struct proc_dir_entry *entry = PDE(inode);
|
||||
struct salinfo_data *data = entry->data;
|
||||
u8 *buf;
|
||||
@ -525,7 +525,7 @@ salinfo_log_clear(struct salinfo_data *data, int cpu)
|
||||
static ssize_t
|
||||
salinfo_log_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
|
||||
{
|
||||
struct inode *inode = file->f_dentry->d_inode;
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
struct proc_dir_entry *entry = PDE(inode);
|
||||
struct salinfo_data *data = entry->data;
|
||||
char cmd[32];
|
||||
|
Loading…
Reference in New Issue
Block a user