These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / llite / dcache.c

diff --git a/kernel/drivers/staging/lustre/lustre/llite/dcache.c b/kernel/drivers/staging/lustre/lustre/llite/dcache.c
index 5af0135..80cba04 100644 (file)
--- a/kernel/drivers/staging/lustre/lustre/llite/dcache.c
+++ b/kernel/drivers/staging/lustre/lustre/llite/dcache.c
@@ -52,7 +52,7 @@ static void free_dentry_data(struct rcu_head *head)
        struct ll_dentry_data *lld;
 
        lld = container_of(head, struct ll_dentry_data, lld_rcu_head);
-       OBD_FREE_PTR(lld);
+       kfree(lld);
 }
 
 /* should NOT be called with the dcache lock, see fs/dcache.c */
@@ -67,7 +67,7 @@ static void ll_release(struct dentry *de)
 
        if (lld->lld_it) {
                ll_intent_release(lld->lld_it);
-               OBD_FREE(lld->lld_it, sizeof(*lld->lld_it));
+               kfree(lld->lld_it);
        }
 
        de->d_fsdata = NULL;
@@ -194,7 +194,7 @@ int ll_d_init(struct dentry *de)
                                de->d_fsdata = lld;
                                __d_lustre_invalidate(de);
                        } else {
-                               OBD_FREE_PTR(lld);
+                               kfree(lld);
                        }
                        spin_unlock(&de->d_lock);
                } else {
@@ -250,7 +250,6 @@ void ll_intent_release(struct lookup_intent *it)
 void ll_invalidate_aliases(struct inode *inode)
 {
        struct dentry *dentry;
-       struct ll_d_hlist_node *p;
 
        LASSERT(inode != NULL);
 
@@ -258,7 +257,7 @@ void ll_invalidate_aliases(struct inode *inode)
               inode->i_ino, inode->i_generation, inode);
 
        ll_lock_dcache(inode);
-       ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry, d_u.d_alias) {
+       hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
                CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p inode %p flags %d\n",
                       dentry, dentry, dentry->d_parent,
                       d_inode(dentry), dentry->d_flags);
@@ -345,7 +344,6 @@ static int ll_revalidate_nd(struct dentry *dentry, unsigned int flags)
        return ll_revalidate_dentry(dentry, flags);
 }
 
-
 static void ll_d_iput(struct dentry *de, struct inode *inode)
 {
        LASSERT(inode);