diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /arch/um/drivers/mconsole_kern.c | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'arch/um/drivers/mconsole_kern.c')
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index ebb265c07e4d..19d579d74d27 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
| @@ -145,8 +145,8 @@ void mconsole_proc(struct mc_request *req) | |||
| 145 | } | 145 | } |
| 146 | up_write(&super->s_umount); | 146 | up_write(&super->s_umount); |
| 147 | 147 | ||
| 148 | nd.dentry = super->s_root; | 148 | nd.path.dentry = super->s_root; |
| 149 | nd.mnt = NULL; | 149 | nd.path.mnt = NULL; |
| 150 | nd.flags = O_RDONLY + 1; | 150 | nd.flags = O_RDONLY + 1; |
| 151 | nd.last_type = LAST_ROOT; | 151 | nd.last_type = LAST_ROOT; |
| 152 | 152 | ||
| @@ -159,7 +159,7 @@ void mconsole_proc(struct mc_request *req) | |||
| 159 | goto out_kill; | 159 | goto out_kill; |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | file = dentry_open(nd.dentry, nd.mnt, O_RDONLY); | 162 | file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY); |
| 163 | if (IS_ERR(file)) { | 163 | if (IS_ERR(file)) { |
| 164 | mconsole_reply(req, "Failed to open file", 1, 0); | 164 | mconsole_reply(req, "Failed to open file", 1, 0); |
| 165 | goto out_kill; | 165 | goto out_kill; |