aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:03 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:45 -0500
commit81454098f7c54118d290cd503bda2a41e3ac43fb (patch)
tree4d48fcca953f1f607027d60a5f70d9fae9d8961a
parent7706a9d6183da7701a9bca7155bccfcd182c670a (diff)
[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>
-rw-r--r--fs/gfs2/ops_file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index b3f1e0349ae0..faa07e4b97d0 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -247,7 +247,7 @@ static const u32 gfs2_to_fsflags[32] = {
247 247
248static int gfs2_get_flags(struct file *filp, u32 __user *ptr) 248static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
249{ 249{
250 struct inode *inode = filp->f_dentry->d_inode; 250 struct inode *inode = filp->f_path.dentry->d_inode;
251 struct gfs2_inode *ip = GFS2_I(inode); 251 struct gfs2_inode *ip = GFS2_I(inode);
252 struct gfs2_holder gh; 252 struct gfs2_holder gh;
253 int error; 253 int error;
@@ -305,7 +305,7 @@ void gfs2_set_inode_flags(struct inode *inode)
305 */ 305 */
306static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) 306static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
307{ 307{
308 struct inode *inode = filp->f_dentry->d_inode; 308 struct inode *inode = filp->f_path.dentry->d_inode;
309 struct gfs2_inode *ip = GFS2_I(inode); 309 struct gfs2_inode *ip = GFS2_I(inode);
310 struct gfs2_sbd *sdp = GFS2_SB(inode); 310 struct gfs2_sbd *sdp = GFS2_SB(inode);
311 struct buffer_head *bh; 311 struct buffer_head *bh;
@@ -588,7 +588,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
588{ 588{
589 struct gfs2_file *fp = file->private_data; 589 struct gfs2_file *fp = file->private_data;
590 struct gfs2_holder *fl_gh = &fp->f_fl_gh; 590 struct gfs2_holder *fl_gh = &fp->f_fl_gh;
591 struct gfs2_inode *ip = GFS2_I(file->f_dentry->d_inode); 591 struct gfs2_inode *ip = GFS2_I(file->f_path.dentry->d_inode);
592 struct gfs2_glock *gl; 592 struct gfs2_glock *gl;
593 unsigned int state; 593 unsigned int state;
594 int flags; 594 int flags;