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

Commit 69d9b544 authored by Amit Pundir's avatar Amit Pundir Committed by Daniel Rosenberg
Browse files

ANDROID: sdcardfs: get rid of 'parent' argument of ->d_compare() 



->d_compare() doesn't get parent as a separate argument anymore
according to upstream commit 6fa67e70 ("get rid of 'parent'
argument of ->d_compare()").

We run into following build error otherwise:

  CC [M]  fs/sdcardfs/dentry.o
fs/sdcardfs/dentry.c:183:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .d_compare = sdcardfs_cmp_ci,
               ^
fs/sdcardfs/dentry.c:183:15: note: (near initialization for ‘sdcardfs_ci_dops.d_compare’)

Change-Id: I51801b57aeb8287f1e69ce6cb944e8722ff37bea
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 4658d3ad

fs/sdcardfs/dentry.c

+1 −2
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ static int sdcardfs_hash_ci(const struct dentry *dentry, 
/*

 * Case insensitive compare of two vfat names.

 */

static int sdcardfs_cmp_ci(const struct dentry *parent,

		const struct dentry *dentry,

static int sdcardfs_cmp_ci(const struct dentry *dentry,

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

{

	/* This function is copy of vfat_cmpi */