Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / staging / lustre / lustre / llite / dcache.c

diff --git a/drivers/staging/lustre/lustre/llite/dcache.c b/drivers/staging/lustre/lustre/llite/dcache.c
index 3e768f997172fa3b63832d549cb27258281a1b3a..11b82c639bfe07d5c71cd4300feea983938dcac2 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/dcache.c
+++ b/drivers/staging/lustre/lustre/llite/dcache.c
@@ -96,7 +96,7 @@ static int ll_dcompare(const struct dentry *dentry,
               d_count(dentry));
 
        /* mountpoint is always valid */
-       if (d_mountpoint((struct dentry *)dentry))
+       if (d_mountpoint(dentry))
                return 0;
 
        /* ensure exclusion against parallel lookup of the same name */
@@ -121,7 +121,7 @@ static int ll_ddelete(const struct dentry *de)
        LASSERT(de);
 
        CDEBUG(D_DENTRY, "%s dentry %pd (%p, parent %p, inode %p) %s%s\n",
-              d_lustre_invalid((struct dentry *)de) ? "deleting" : "keeping",
+              d_lustre_invalid(de) ? "deleting" : "keeping",
               de, de, de->d_parent, d_inode(de),
               d_unhashed(de) ? "" : "hashed,",
               list_empty(&de->d_subdirs) ? "" : "subdirs");
@@ -129,7 +129,7 @@ static int ll_ddelete(const struct dentry *de)
        /* kernel >= 2.6.38 last refcount is decreased after this function. */
        LASSERT(d_count(de) == 1);
 
-       if (d_lustre_invalid((struct dentry *)de))
+       if (d_lustre_invalid(de))
                return 1;
        return 0;
 }