[PATCH] isofs: change uses of f_{dentry, vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the isofs filesystem. Signed-off-by: Josef "Jeff" Sipek <jsipek@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
dba3230609
commit
2485822d51
@ -42,7 +42,7 @@ static struct semaphore zisofs_zlib_semaphore;
|
|||||||
*/
|
*/
|
||||||
static int zisofs_readpage(struct file *file, struct page *page)
|
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;
|
struct address_space *mapping = inode->i_mapping;
|
||||||
unsigned int maxpage, xpage, fpage, blockindex;
|
unsigned int maxpage, xpage, fpage, blockindex;
|
||||||
unsigned long offset;
|
unsigned long offset;
|
||||||
|
@ -183,7 +183,7 @@ static int do_isofs_readdir(struct inode *inode, struct file *filp,
|
|||||||
|
|
||||||
/* Handle the case of the '..' directory */
|
/* Handle the case of the '..' directory */
|
||||||
if (de->name_len[0] == 1 && de->name[0] == 1) {
|
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)
|
if (filldir(dirent, "..", 2, filp->f_pos, inode_number, DT_DIR) < 0)
|
||||||
break;
|
break;
|
||||||
filp->f_pos += de_len;
|
filp->f_pos += de_len;
|
||||||
@ -255,8 +255,7 @@ static int isofs_readdir(struct file *filp,
|
|||||||
int result;
|
int result;
|
||||||
char * tmpname;
|
char * tmpname;
|
||||||
struct iso_directory_record * tmpde;
|
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);
|
tmpname = (char *)__get_free_page(GFP_KERNEL);
|
||||||
if (tmpname == NULL)
|
if (tmpname == NULL)
|
||||||
|
Loading…
Reference in New Issue
Block a user