提交 81454098 编写于 作者: J Josef Sipek 提交者: Linus Torvalds

[PATCH] struct path: convert gfs2

Signed-off-by: NJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 7706a9d6
...@@ -247,7 +247,7 @@ static const u32 gfs2_to_fsflags[32] = { ...@@ -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) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册