diff options
author | Jan Blunck <jblunck@suse.de> | 2008-02-14 22:34:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:13:33 -0500 |
commit | 4ac9137858e08a19f29feac4e1f4df7c268b0ba5 (patch) | |
tree | f5b5d84fd12fcc2b0ba0e7ce1a79ff381ad8f5dd /arch/um/drivers/mconsole_kern.c | |
parent | c5e725f33b733a77de622e91b6ba5645fcf070be (diff) |
Embed a struct path into struct nameidata instead of nd->{dentry,mnt}
This is the central patch of a cleanup series. In most cases there is no good
reason why someone would want to use a dentry for itself. This series reflects
that fact and embeds a struct path into nameidata.
Together with the other patches of this series
- it enforced the correct order of getting/releasing the reference count on
<dentry,vfsmount> pairs
- it prepares the VFS for stacking support since it is essential to have a
struct path in every place where the stack can be traversed
- it reduces the overall code size:
without patch series:
text data bss dec hex filename
5321639 858418 715768 6895825 6938d1 vmlinux
with patch series:
text data bss dec hex filename
5320026 858418 715768 6894212 693284 vmlinux
This patch:
Switch from nd->{dentry,mnt} to nd->path.{dentry,mnt} everywhere.
[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: fix cifs]
[akpm@linux-foundation.org: fix smack]
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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; |