Selaa lähdekoodia

[PATCH] struct path: convert gfs2

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>
Josef Sipek 18 vuotta sitten
vanhempi
commit
81454098f7
1 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 3 3
      fs/gfs2/ops_file.c

+ 3 - 3
fs/gfs2/ops_file.c

@@ -247,7 +247,7 @@ static const u32 gfs2_to_fsflags[32] = {
 
 
 static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
 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_inode *ip = GFS2_I(inode);
 	struct gfs2_holder gh;
 	struct gfs2_holder gh;
 	int error;
 	int error;
@@ -305,7 +305,7 @@ void gfs2_set_inode_flags(struct inode *inode)
  */
  */
 static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
 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_inode *ip = GFS2_I(inode);
 	struct gfs2_sbd *sdp = GFS2_SB(inode);
 	struct gfs2_sbd *sdp = GFS2_SB(inode);
 	struct buffer_head *bh;
 	struct buffer_head *bh;
@@ -588,7 +588,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
 {
 {
 	struct gfs2_file *fp = file->private_data;
 	struct gfs2_file *fp = file->private_data;
 	struct gfs2_holder *fl_gh = &fp->f_fl_gh;
 	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;
 	struct gfs2_glock *gl;
 	unsigned int state;
 	unsigned int state;
 	int flags;
 	int flags;