diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 16:14:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 22:54:35 -0400 |
commit | 26fe575028703948880fce4355a210c76bb0536e (patch) | |
tree | 0a7d04289e1eb1f1739659ebc9498d40f2add5da /net/sunrpc/rpc_pipe.c | |
parent | ee983e89670704b2a05e897b161f2674a42d1508 (diff) |
vfs: make it possible to access the dentry hash/len as one 64-bit entry
This allows comparing hash and len in one operation on 64-bit
architectures. Right now only __d_lookup_rcu() takes advantage of this,
since that is the case we care most about.
The use of anonymous struct/unions hides the alternate 64-bit approach
from most users, the exception being a few cases where we initialize a
'struct qstr' with a static initializer. This makes the problematic
cases use a new QSTR_INIT() helper function for that (but initializing
just the name pointer with a "{ .name = xyzzy }" initializer remains
valid, as does just copying another qstr structure).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/sunrpc/rpc_pipe.c')
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 3b62cf288031..fd2423991c2d 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -1059,12 +1059,9 @@ static const struct rpc_filelist files[] = { | |||
1059 | struct dentry *rpc_d_lookup_sb(const struct super_block *sb, | 1059 | struct dentry *rpc_d_lookup_sb(const struct super_block *sb, |
1060 | const unsigned char *dir_name) | 1060 | const unsigned char *dir_name) |
1061 | { | 1061 | { |
1062 | struct qstr dir = { | 1062 | struct qstr dir = QSTR_INIT(dir_name, strlen(dir_name)); |
1063 | .name = dir_name, | ||
1064 | .len = strlen(dir_name), | ||
1065 | .hash = full_name_hash(dir_name, strlen(dir_name)), | ||
1066 | }; | ||
1067 | 1063 | ||
1064 | dir.hash = full_name_hash(dir.name, dir.len); | ||
1068 | return d_lookup(sb->s_root, &dir); | 1065 | return d_lookup(sb->s_root, &dir); |
1069 | } | 1066 | } |
1070 | EXPORT_SYMBOL_GPL(rpc_d_lookup_sb); | 1067 | EXPORT_SYMBOL_GPL(rpc_d_lookup_sb); |