diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:45 -0500 |
commit | b39424e274a17c9c3233c9911dd328b10370de8f (patch) | |
tree | 104c4ec8544f4cfe69547c872e3f40a0512ba235 | |
parent | 471b17e7ed0cb29338458eaa09103902891d802a (diff) |
[PATCH] struct path: convert hugetlbfs
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>
-rw-r--r-- | fs/hugetlbfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 0706f5aac6a2..ed2c22340ad7 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -58,7 +58,7 @@ static void huge_pagevec_release(struct pagevec *pvec) | |||
58 | 58 | ||
59 | static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) | 59 | static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) |
60 | { | 60 | { |
61 | struct inode *inode = file->f_dentry->d_inode; | 61 | struct inode *inode = file->f_path.dentry->d_inode; |
62 | loff_t len, vma_len; | 62 | loff_t len, vma_len; |
63 | int ret; | 63 | int ret; |
64 | 64 | ||
@@ -774,8 +774,8 @@ struct file *hugetlb_zero_setup(size_t size) | |||
774 | d_instantiate(dentry, inode); | 774 | d_instantiate(dentry, inode); |
775 | inode->i_size = size; | 775 | inode->i_size = size; |
776 | inode->i_nlink = 0; | 776 | inode->i_nlink = 0; |
777 | file->f_vfsmnt = mntget(hugetlbfs_vfsmount); | 777 | file->f_path.mnt = mntget(hugetlbfs_vfsmount); |
778 | file->f_dentry = dentry; | 778 | file->f_path.dentry = dentry; |
779 | file->f_mapping = inode->i_mapping; | 779 | file->f_mapping = inode->i_mapping; |
780 | file->f_op = &hugetlbfs_file_operations; | 780 | file->f_op = &hugetlbfs_file_operations; |
781 | file->f_mode = FMODE_WRITE | FMODE_READ; | 781 | file->f_mode = FMODE_WRITE | FMODE_READ; |