diff options
-rw-r--r-- | fs/isofs/compress.c | 2 | ||||
-rw-r--r-- | fs/isofs/dir.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c index 731816332b12..6bbbdb53581d 100644 --- a/fs/isofs/compress.c +++ b/fs/isofs/compress.c | |||
@@ -42,7 +42,7 @@ static struct semaphore zisofs_zlib_semaphore; | |||
42 | */ | 42 | */ |
43 | static int zisofs_readpage(struct file *file, struct page *page) | 43 | static int zisofs_readpage(struct file *file, struct page *page) |
44 | { | 44 | { |
45 | struct inode *inode = file->f_dentry->d_inode; | 45 | struct inode *inode = file->f_path.dentry->d_inode; |
46 | struct address_space *mapping = inode->i_mapping; | 46 | struct address_space *mapping = inode->i_mapping; |
47 | unsigned int maxpage, xpage, fpage, blockindex; | 47 | unsigned int maxpage, xpage, fpage, blockindex; |
48 | unsigned long offset; | 48 | unsigned long offset; |
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 27e276987fd2..4af2548f97a9 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c | |||
@@ -183,7 +183,7 @@ static int do_isofs_readdir(struct inode *inode, struct file *filp, | |||
183 | 183 | ||
184 | /* Handle the case of the '..' directory */ | 184 | /* Handle the case of the '..' directory */ |
185 | if (de->name_len[0] == 1 && de->name[0] == 1) { | 185 | if (de->name_len[0] == 1 && de->name[0] == 1) { |
186 | inode_number = parent_ino(filp->f_dentry); | 186 | inode_number = parent_ino(filp->f_path.dentry); |
187 | if (filldir(dirent, "..", 2, filp->f_pos, inode_number, DT_DIR) < 0) | 187 | if (filldir(dirent, "..", 2, filp->f_pos, inode_number, DT_DIR) < 0) |
188 | break; | 188 | break; |
189 | filp->f_pos += de_len; | 189 | filp->f_pos += de_len; |
@@ -255,8 +255,7 @@ static int isofs_readdir(struct file *filp, | |||
255 | int result; | 255 | int result; |
256 | char * tmpname; | 256 | char * tmpname; |
257 | struct iso_directory_record * tmpde; | 257 | struct iso_directory_record * tmpde; |
258 | struct inode *inode = filp->f_dentry->d_inode; | 258 | struct inode *inode = filp->f_path.dentry->d_inode; |
259 | |||
260 | 259 | ||
261 | tmpname = (char *)__get_free_page(GFP_KERNEL); | 260 | tmpname = (char *)__get_free_page(GFP_KERNEL); |
262 | if (tmpname == NULL) | 261 | if (tmpname == NULL) |