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/dquot.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/dquot.c')
-rw-r--r-- | fs/dquot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/dquot.c b/fs/dquot.c index def4e969df77..289f48d2c727 100644 --- a/fs/dquot.c +++ b/fs/dquot.c | |||
@@ -1633,14 +1633,15 @@ int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path) | |||
1633 | error = path_lookup(path, LOOKUP_FOLLOW, &nd); | 1633 | error = path_lookup(path, LOOKUP_FOLLOW, &nd); |
1634 | if (error < 0) | 1634 | if (error < 0) |
1635 | return error; | 1635 | return error; |
1636 | error = security_quota_on(nd.dentry); | 1636 | error = security_quota_on(nd.path.dentry); |
1637 | if (error) | 1637 | if (error) |
1638 | goto out_path; | 1638 | goto out_path; |
1639 | /* Quota file not on the same filesystem? */ | 1639 | /* Quota file not on the same filesystem? */ |
1640 | if (nd.mnt->mnt_sb != sb) | 1640 | if (nd.path.mnt->mnt_sb != sb) |
1641 | error = -EXDEV; | 1641 | error = -EXDEV; |
1642 | else | 1642 | else |
1643 | error = vfs_quota_on_inode(nd.dentry->d_inode, type, format_id); | 1643 | error = vfs_quota_on_inode(nd.path.dentry->d_inode, type, |
1644 | format_id); | ||
1644 | out_path: | 1645 | out_path: |
1645 | path_release(&nd); | 1646 | path_release(&nd); |
1646 | return error; | 1647 | return error; |