From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- fs/gfs2/ops_file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN fs/gfs2/ops_file.c~struct-path-convert-gfs2 fs/gfs2/ops_file.c --- a/fs/gfs2/ops_file.c~struct-path-convert-gfs2 +++ a/fs/gfs2/ops_file.c @@ -246,7 +246,7 @@ static const u32 gfs2_to_fsflags[32] = { static int gfs2_get_flags(struct file *filp, u32 __user *ptr) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_holder gh; int error; @@ -286,7 +286,7 @@ static int gfs2_get_flags(struct file *f */ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_sbd *sdp = GFS2_SB(inode); struct buffer_head *bh; @@ -544,7 +544,7 @@ static int do_flock(struct file *file, i { struct gfs2_file *fp = file->private_data; struct gfs2_holder *fl_gh = &fp->f_fl_gh; - struct gfs2_inode *ip = GFS2_I(file->f_dentry->d_inode); + struct gfs2_inode *ip = GFS2_I(file->f_path.dentry->d_inode); struct gfs2_glock *gl; unsigned int state; int flags; _