Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90181e1d authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre/llite: fix for d_compare API change 



Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5237c441

drivers/staging/lustre/lustre/llite/dcache.c

+1 −2
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ static void ll_release(struct dentry *de) 
 * an AST before calling d_revalidate_it().  The dentry still exists (marked

 * INVALID) so d_lookup() matches it, but we have no lock on it (so

 * lock_match() fails) and we spin around real_lookup(). */

int ll_dcompare(const struct dentry *parent, const struct inode *pinode,

		const struct dentry *dentry, const struct inode *inode,

int ll_dcompare(const struct dentry *parent, const struct dentry *dentry,

		unsigned int len, const char *str, const struct qstr *name)

{

	ENTRY;

drivers/staging/lustre/lustre/llite/llite_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -784,8 +784,7 @@ void ll_intent_release(struct lookup_intent *); 
void ll_invalidate_aliases(struct inode *);

void ll_frob_intent(struct lookup_intent **itp, struct lookup_intent *deft);

void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);

int ll_dcompare(const struct dentry *parent, const struct inode *pinode,

		const struct dentry *dentry, const struct inode *inode,

int ll_dcompare(const struct dentry *parent, const struct dentry *dentry,

		unsigned int len, const char *str, const struct qstr *d_name);

int ll_revalidate_it_finish(struct ptlrpc_request *request,

			    struct lookup_intent *it, struct dentry *de);