Skip to content

Commit

Permalink
[PATCH] isofs: change uses of f_{dentry, vfsmnt} to use f_path
Browse files Browse the repository at this point in the history
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the isofs
filesystem.

Signed-off-by: Josef "Jeff" Sipek <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Josef "Jeff" Sipek authored and Linus Torvalds committed Dec 8, 2006
1 parent dba3230 commit 2485822
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion fs/isofs/compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static struct semaphore zisofs_zlib_semaphore;
*/
static int zisofs_readpage(struct file *file, struct page *page)
{
struct inode *inode = file->f_dentry->d_inode;
struct inode *inode = file->f_path.dentry->d_inode;
struct address_space *mapping = inode->i_mapping;
unsigned int maxpage, xpage, fpage, blockindex;
unsigned long offset;
Expand Down
5 changes: 2 additions & 3 deletions fs/isofs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static int do_isofs_readdir(struct inode *inode, struct file *filp,

/* Handle the case of the '..' directory */
if (de->name_len[0] == 1 && de->name[0] == 1) {
inode_number = parent_ino(filp->f_dentry);
inode_number = parent_ino(filp->f_path.dentry);
if (filldir(dirent, "..", 2, filp->f_pos, inode_number, DT_DIR) < 0)
break;
filp->f_pos += de_len;
Expand Down Expand Up @@ -255,8 +255,7 @@ static int isofs_readdir(struct file *filp,
int result;
char * tmpname;
struct iso_directory_record * tmpde;
struct inode *inode = filp->f_dentry->d_inode;

struct inode *inode = filp->f_path.dentry->d_inode;

tmpname = (char *)__get_free_page(GFP_KERNEL);
if (tmpname == NULL)
Expand Down

0 comments on commit 2485822

Please sign in to comment.