ANDROID: sdcardfs: get rid of 'parent' argument of ->d_compare()
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 8 Aug 2016 06:57:33 +0000 (12:27 +0530)
committerDaniel Rosenberg <drosen@google.com>
Tue, 30 Jan 2018 03:40:02 +0000 (19:40 -0800)
->d_compare() doesn't get parent as a separate argument anymore
according to upstream commit 6fa67e707559 ("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: Amit Pundir <amit.pundir@linaro.org>
fs/sdcardfs/dentry.c

index e4156a6fa8c8f2b70cff734f585fda2254773d1b..f22de8add10ce3db8dd1b2b5cace6c54f1d754d2 100644 (file)
@@ -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 */