[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:

committed by
Linus Torvalds

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))
|
||||
|
Reference in New Issue
Block a user