i/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Eliminate the offset argument to sdcardfs_direct_IO() which is dropped
by upstream commit c8b8e32d70 ("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>
This commit is contained in:
Amit Pundir
2016-06-07 16:30:56 +05:30
committed by Dmitry Shmidt
parent d4ae31ba98
commit 71f1b59471
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/sdcardfs/mmap.c
+1 -2
View File
@@ -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.