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/affs | |
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/affs')
-rw-r--r-- | fs/affs/namei.c | 2 | ||||
-rw-r--r-- | fs/affs/super.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/affs/namei.c b/fs/affs/namei.c index 5aca08c21100..944a4042fb65 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c | |||
@@ -240,7 +240,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) | |||
240 | if (IS_ERR(inode)) | 240 | if (IS_ERR(inode)) |
241 | return ERR_CAST(inode); | 241 | return ERR_CAST(inode); |
242 | } | 242 | } |
243 | dentry->d_op = AFFS_SB(sb)->s_flags & SF_INTL ? &affs_intl_dentry_operations : &affs_dentry_operations; | 243 | d_set_d_op(dentry, AFFS_SB(sb)->s_flags & SF_INTL ? &affs_intl_dentry_operations : &affs_dentry_operations); |
244 | d_add(dentry, inode); | 244 | d_add(dentry, inode); |
245 | return NULL; | 245 | return NULL; |
246 | } | 246 | } |
diff --git a/fs/affs/super.c b/fs/affs/super.c index 4c18fcfb0a19..d39081bbe7ce 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c | |||
@@ -482,7 +482,7 @@ got_root: | |||
482 | printk(KERN_ERR "AFFS: Get root inode failed\n"); | 482 | printk(KERN_ERR "AFFS: Get root inode failed\n"); |
483 | goto out_error; | 483 | goto out_error; |
484 | } | 484 | } |
485 | sb->s_root->d_op = &affs_dentry_operations; | 485 | d_set_d_op(sb->s_root, &affs_dentry_operations); |
486 | 486 | ||
487 | pr_debug("AFFS: s_flags=%lX\n",sb->s_flags); | 487 | pr_debug("AFFS: s_flags=%lX\n",sb->s_flags); |
488 | return 0; | 488 | return 0; |