dcache: remove unnecessary NULL check in dget_dlock()

[linux-2.6-microblaze.git] / fs / dcache.c

diff --git a/fs/dcache.c b/fs/dcache.c
index 523cbf0..bb18ea9 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -877,12 +877,6 @@ void dput_to_list(struct dentry *dentry, struct list_head *list)
        spin_unlock(&dentry->d_lock);
 }
 
-/* This must be called with d_lock held */
-static inline void __dget_dlock(struct dentry *dentry)
-{
-       dentry->d_lockref.count++;
-}
-
 struct dentry *dget_parent(struct dentry *dentry)
 {
        int gotref;
@@ -964,7 +958,7 @@ static struct dentry *__d_find_alias(struct inode *inode)
        hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) {
                spin_lock(&alias->d_lock);
                if (!d_unhashed(alias)) {
-                       __dget_dlock(alias);
+                       dget_dlock(alias);
                        spin_unlock(&alias->d_lock);
                        return alias;
                }
@@ -1569,8 +1563,7 @@ static enum d_walk_ret find_submount(void *_data, struct dentry *dentry)
 {
        struct dentry **victim = _data;
        if (d_mountpoint(dentry)) {
-               __dget_dlock(dentry);
-               *victim = dentry;
+               *victim = dget_dlock(dentry);
                return D_WALK_QUIT;
        }
        return D_WALK_CONTINUE;
@@ -1715,8 +1708,7 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name)
         * don't need child lock because it is not subject
         * to concurrency here
         */
-       __dget_dlock(parent);
-       dentry->d_parent = parent;
+       dentry->d_parent = dget_dlock(parent);
        hlist_add_head(&dentry->d_sib, &parent->d_children);
        spin_unlock(&parent->d_lock);
 
@@ -2683,7 +2675,7 @@ struct dentry *d_exact_alias(struct dentry *entry, struct inode *inode)
                        spin_unlock(&alias->d_lock);
                        alias = NULL;
                } else {
-                       __dget_dlock(alias);
+                       dget_dlock(alias);
                        __d_rehash(alias);
                        spin_unlock(&alias->d_lock);
                }