projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
fs
/
nfs
/
nfs4file.c
diff --git
a/fs/nfs/nfs4file.c
b/fs/nfs/nfs4file.c
index
22c35ab
..
d039051
100644
(file)
--- a/
fs/nfs/nfs4file.c
+++ b/
fs/nfs/nfs4file.c
@@
-26,7
+26,7
@@
static int
nfs4_file_open(struct inode *inode, struct file *filp)
{
struct nfs_open_context *ctx;
nfs4_file_open(struct inode *inode, struct file *filp)
{
struct nfs_open_context *ctx;
- struct dentry *dentry = fil
p->f_path.dentry
;
+ struct dentry *dentry = fil
e_dentry(filp)
;
struct dentry *parent = NULL;
struct inode *dir;
unsigned openflags = filp->f_flags;
struct dentry *parent = NULL;
struct inode *dir;
unsigned openflags = filp->f_flags;
@@
-57,7
+57,7
@@
nfs4_file_open(struct inode *inode, struct file *filp)
parent = dget_parent(dentry);
dir = d_inode(parent);
parent = dget_parent(dentry);
dir = d_inode(parent);
- ctx = alloc_nfs_open_context(fil
p->f_path.dentry
, filp->f_mode);
+ ctx = alloc_nfs_open_context(fil
e_dentry(filp)
, filp->f_mode);
err = PTR_ERR(ctx);
if (IS_ERR(ctx))
goto out;
err = PTR_ERR(ctx);
if (IS_ERR(ctx))
goto out;