diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:49:55 -0500 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:28 -0500 |
commit | fb045adb99d9b7c562dc7fef834857f78249daa1 (patch) | |
tree | 1fd6a4024fffeec568abe100d730589bfdb81c38 /fs/fuse | |
parent | 5f57cbcc02cf18f6b22ef4066bb10afeb8f930ff (diff) |
fs: dcache reduce branches in lookup path
Reduce some branches and memory accesses in dcache lookup by adding dentry
flags to indicate common d_ops are set, rather than having to check them.
This saves a pointer memory access (dentry->d_op) in common path lookup
situations, and saves another pointer load and branch in cases where we
have d_op but not the particular operation.
Patched with:
git grep -E '[.>]([[:space:]])*d_op([[:space:]])*=' | xargs sed -e 's/\([^\t ]*\)->d_op = \(.*\);/d_set_d_op(\1, \2);/' -e 's/\([^\t ]*\)\.d_op = \(.*\);/d_set_d_op(\&\1, \2);/' -i
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/dir.c | 2 | ||||
-rw-r--r-- | fs/fuse/inode.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index c9627c95482d..c9a8a426a395 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c | |||
@@ -347,7 +347,7 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry, | |||
347 | } | 347 | } |
348 | 348 | ||
349 | entry = newent ? newent : entry; | 349 | entry = newent ? newent : entry; |
350 | entry->d_op = &fuse_dentry_operations; | 350 | d_set_d_op(entry, &fuse_dentry_operations); |
351 | if (outarg_valid) | 351 | if (outarg_valid) |
352 | fuse_change_entry_timeout(entry, &outarg); | 352 | fuse_change_entry_timeout(entry, &outarg); |
353 | else | 353 | else |
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 44e0a6c57e87..a8b31da19b93 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -626,7 +626,7 @@ static struct dentry *fuse_get_dentry(struct super_block *sb, | |||
626 | 626 | ||
627 | entry = d_obtain_alias(inode); | 627 | entry = d_obtain_alias(inode); |
628 | if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID) { | 628 | if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID) { |
629 | entry->d_op = &fuse_dentry_operations; | 629 | d_set_d_op(entry, &fuse_dentry_operations); |
630 | fuse_invalidate_entry_cache(entry); | 630 | fuse_invalidate_entry_cache(entry); |
631 | } | 631 | } |
632 | 632 | ||
@@ -728,7 +728,7 @@ static struct dentry *fuse_get_parent(struct dentry *child) | |||
728 | 728 | ||
729 | parent = d_obtain_alias(inode); | 729 | parent = d_obtain_alias(inode); |
730 | if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID) { | 730 | if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID) { |
731 | parent->d_op = &fuse_dentry_operations; | 731 | d_set_d_op(parent, &fuse_dentry_operations); |
732 | fuse_invalidate_entry_cache(parent); | 732 | fuse_invalidate_entry_cache(parent); |
733 | } | 733 | } |
734 | 734 | ||