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/nfs/nfs4proc.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/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 027e1095256e..7ce07862c2fb 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -1384,11 +1384,11 @@ out_close: | |||
1384 | struct dentry * | 1384 | struct dentry * |
1385 | nfs4_atomic_open(struct inode *dir, struct dentry *dentry, struct nameidata *nd) | 1385 | nfs4_atomic_open(struct inode *dir, struct dentry *dentry, struct nameidata *nd) |
1386 | { | 1386 | { |
1387 | struct dentry *parent; | ||
1388 | struct path path = { | 1387 | struct path path = { |
1389 | .mnt = nd->mnt, | 1388 | .mnt = nd->path.mnt, |
1390 | .dentry = dentry, | 1389 | .dentry = dentry, |
1391 | }; | 1390 | }; |
1391 | struct dentry *parent; | ||
1392 | struct iattr attr; | 1392 | struct iattr attr; |
1393 | struct rpc_cred *cred; | 1393 | struct rpc_cred *cred; |
1394 | struct nfs4_state *state; | 1394 | struct nfs4_state *state; |
@@ -1433,7 +1433,7 @@ int | |||
1433 | nfs4_open_revalidate(struct inode *dir, struct dentry *dentry, int openflags, struct nameidata *nd) | 1433 | nfs4_open_revalidate(struct inode *dir, struct dentry *dentry, int openflags, struct nameidata *nd) |
1434 | { | 1434 | { |
1435 | struct path path = { | 1435 | struct path path = { |
1436 | .mnt = nd->mnt, | 1436 | .mnt = nd->path.mnt, |
1437 | .dentry = dentry, | 1437 | .dentry = dentry, |
1438 | }; | 1438 | }; |
1439 | struct rpc_cred *cred; | 1439 | struct rpc_cred *cred; |
@@ -1885,7 +1885,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | |||
1885 | int flags, struct nameidata *nd) | 1885 | int flags, struct nameidata *nd) |
1886 | { | 1886 | { |
1887 | struct path path = { | 1887 | struct path path = { |
1888 | .mnt = nd->mnt, | 1888 | .mnt = nd->path.mnt, |
1889 | .dentry = dentry, | 1889 | .dentry = dentry, |
1890 | }; | 1890 | }; |
1891 | struct nfs4_state *state; | 1891 | struct nfs4_state *state; |