From: Amit Pundir <amit.pundir@linaro.org>
Date: Tue, 7 Jun 2016 11:00:56 +0000 (+0530)
Subject: ANDROID: sdcardfs: eliminate the offset argument to ->direct_IO
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c11ba7c90adccafa95cd0f5127d2473cbc06d09c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ANDROID: sdcardfs: eliminate the offset argument to ->direct_IO

Eliminate the offset argument to sdcardfs_direct_IO() which is dropped
by upstream commit c8b8e32d700f ("direct-io: eliminate the offset
argument to ->direct_IO"), otherwise we run into following build error:

  CC [M]  fs/sdcardfs/mmap.o
fs/sdcardfs/mmap.c:76:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .direct_IO = sdcardfs_direct_IO,
               ^
fs/sdcardfs/mmap.c:76:15: note: (near initialization for ‘sdcardfs_aops.direct_IO’)

Change-Id: I292d93bb16365a9fa46494accb2b5da51028b5c1
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---

diff --git a/fs/sdcardfs/mmap.c b/fs/sdcardfs/mmap.c
index e21f64675a80..ac5f3deae088 100644
--- a/fs/sdcardfs/mmap.c
+++ b/fs/sdcardfs/mmap.c
@@ -48,8 +48,7 @@ static int sdcardfs_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 	return err;
 }
 
-static ssize_t sdcardfs_direct_IO(struct kiocb *iocb,
-		struct iov_iter *iter, loff_t pos)
+static ssize_t sdcardfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 {
 	/*
      * This function returns zero on purpose in order to support direct IO.