diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-10 11:55:37 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 14:33:37 +0200 |
| commit | a4a3bdd778715999ddfeefdc52ab76254580fa76 (patch) | |
| tree | cd154e1bbcf2d899c30309fa179e5fc5de968d58 /fs/open.c | |
| parent | make ->atomic_open() return int (diff) | |
| download | linux-a4a3bdd778715999ddfeefdc52ab76254580fa76.tar.xz linux-a4a3bdd778715999ddfeefdc52ab76254580fa76.zip | |
kill opendata->{mnt,dentry}
->filp->f_path is there for purpose...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/open.c b/fs/open.c index c87f98201c29..2b1654d8bfbd 100644 --- a/fs/open.c +++ b/fs/open.c @@ -788,10 +788,10 @@ struct file *finish_open(struct opendata *od, struct dentry *dentry, struct file *res; BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */ - mntget(od->mnt); + mntget(od->filp->f_path.mnt); dget(dentry); - res = do_dentry_open(dentry, od->mnt, od->filp, open, current_cred()); + res = do_dentry_open(dentry, od->filp->f_path.mnt, od->filp, open, current_cred()); if (!IS_ERR(res)) *opened |= FILE_OPENED; @@ -810,7 +810,7 @@ EXPORT_SYMBOL(finish_open); */ void finish_no_open(struct opendata *od, struct dentry *dentry) { - od->dentry = dentry; + od->filp->f_path.dentry = dentry; } EXPORT_SYMBOL(finish_no_open); |