diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /fs/nfsctl.c | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'fs/nfsctl.c')
| -rw-r--r-- | fs/nfsctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsctl.c b/fs/nfsctl.c index 51f1b31acbf6..aed8145d9087 100644 --- a/fs/nfsctl.c +++ b/fs/nfsctl.c | |||
| @@ -41,9 +41,9 @@ static struct file *do_open(char *name, int flags) | |||
| 41 | error = may_open(&nd, MAY_WRITE, FMODE_WRITE); | 41 | error = may_open(&nd, MAY_WRITE, FMODE_WRITE); |
| 42 | 42 | ||
| 43 | if (!error) | 43 | if (!error) |
| 44 | return dentry_open(nd.dentry, nd.mnt, flags); | 44 | return dentry_open(nd.path.dentry, nd.path.mnt, flags); |
| 45 | 45 | ||
| 46 | path_release(&nd); | 46 | path_put(&nd.path); |
| 47 | return ERR_PTR(error); | 47 | return ERR_PTR(error); |
| 48 | } | 48 | } |
| 49 | 49 | ||