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

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

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



Eliminate the offset argument to sdcardfs_direct_IO() which is dropped
by upstream commit c8b8e32d ("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: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 373f7f5c

fs/sdcardfs/mmap.c

+1 −2
Original line number Diff line number Diff line
@@ -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.