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

Commit bf5fc402 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix O_DIRECT compile warnings 



Fix the following compile warnings:
fs/nfs/direct.c: In function 'nfs_direct_read_schedule_segment':
fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:352:27: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c: In function 'nfs_direct_write_schedule_segment':
fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:650:27: warning: comparison of distinct pointer types
lacks a cast [enabled by default]

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
parent d69ee9b8

fs/nfs/direct.c

+4 −4
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de 
		int i;



		pgbase = user_addr & ~PAGE_MASK;

		bytes = min(max(rsize, PAGE_SIZE), count);

		bytes = min(max_t(size_t, rsize, PAGE_SIZE), count);



		result = -ENOMEM;

		npages = nfs_page_array_len(pgbase, bytes);
@@ -349,7 +349,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de 


		for (i = 0; i < npages; i++) {

			struct nfs_page *req;

			unsigned int req_len = min(bytes, PAGE_SIZE - pgbase);

			unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);

			/* XXX do we need to do the eof zeroing found in async_filler? */

			req = nfs_create_request(dreq->ctx, dreq->inode,

						 pagevec[i],
@@ -619,7 +619,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d 
		int i;



		pgbase = user_addr & ~PAGE_MASK;

		bytes = min(max(wsize, PAGE_SIZE), count);

		bytes = min(max_t(size_t, wsize, PAGE_SIZE), count);



		result = -ENOMEM;

		npages = nfs_page_array_len(pgbase, bytes);
@@ -647,7 +647,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d 


		for (i = 0; i < npages; i++) {

			struct nfs_page *req;

			unsigned int req_len = min(bytes, PAGE_SIZE - pgbase);

			unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);



			req = nfs_create_request(dreq->ctx, dreq->inode,

						 pagevec[i],