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 /fs/exec.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 'fs/exec.c')
-rw-r--r-- | fs/exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -112,7 +112,7 @@ asmlinkage long sys_uselib(const char __user * library) | |||
112 | goto out; | 112 | goto out; |
113 | 113 | ||
114 | error = -EINVAL; | 114 | error = -EINVAL; |
115 | if (!S_ISREG(nd.dentry->d_inode->i_mode)) | 115 | if (!S_ISREG(nd.path.dentry->d_inode->i_mode)) |
116 | goto exit; | 116 | goto exit; |
117 | 117 | ||
118 | error = vfs_permission(&nd, MAY_READ | MAY_EXEC); | 118 | error = vfs_permission(&nd, MAY_READ | MAY_EXEC); |
@@ -652,7 +652,7 @@ struct file *open_exec(const char *name) | |||
652 | file = ERR_PTR(err); | 652 | file = ERR_PTR(err); |
653 | 653 | ||
654 | if (!err) { | 654 | if (!err) { |
655 | struct inode *inode = nd.dentry->d_inode; | 655 | struct inode *inode = nd.path.dentry->d_inode; |
656 | file = ERR_PTR(-EACCES); | 656 | file = ERR_PTR(-EACCES); |
657 | if (S_ISREG(inode->i_mode)) { | 657 | if (S_ISREG(inode->i_mode)) { |
658 | int err = vfs_permission(&nd, MAY_EXEC); | 658 | int err = vfs_permission(&nd, MAY_EXEC); |