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>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/staging/autofs/root.c b/drivers/staging/autofs/root.c
index 0fdec4befd84..b09adb57971f 100644
--- a/drivers/staging/autofs/root.c
+++ b/drivers/staging/autofs/root.c
@@ -237,7 +237,7 @@ static struct dentry *autofs_root_lookup(struct inode *dir, struct dentry *dentr
          *
          * We need to do this before we release the directory semaphore.
          */
-        dentry->d_op = &autofs_dentry_operations;
+        d_set_d_op(dentry, &autofs_dentry_operations);
         dentry->d_flags |= DCACHE_AUTOFS_PENDING;
         d_add(dentry, NULL);
 
diff --git a/drivers/staging/smbfs/dir.c b/drivers/staging/smbfs/dir.c
index 5f79799d5d4a..78f09412740c 100644
--- a/drivers/staging/smbfs/dir.c
+++ b/drivers/staging/smbfs/dir.c
@@ -398,9 +398,9 @@ smb_new_dentry(struct dentry *dentry)
         struct smb_sb_info *server = server_from_dentry(dentry);
 
         if (server->mnt->flags & SMB_MOUNT_CASE)
-                dentry->d_op = &smbfs_dentry_operations_case;
+                d_set_d_op(dentry, &smbfs_dentry_operations_case);
         else
-                dentry->d_op = &smbfs_dentry_operations;
+                d_set_d_op(dentry, &smbfs_dentry_operations);
         dentry->d_time = jiffies;
 }
 
@@ -462,9 +462,9 @@ smb_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         add_entry:
                         server = server_from_dentry(dentry);
                         if (server->mnt->flags & SMB_MOUNT_CASE)
-                                dentry->d_op = &smbfs_dentry_operations_case;
+                                d_set_d_op(dentry, &smbfs_dentry_operations_case);
                         else
-                                dentry->d_op = &smbfs_dentry_operations;
+                                d_set_d_op(dentry, &smbfs_dentry_operations);
 
                         d_add(dentry, inode);
                         smb_renew_times(dentry);