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

Commit ce60a2f1 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: fix argument type in fuse_get_user_pages() 



Fix the following warning:

fs/fuse/file.c: In function 'fuse_direct_io':
fs/fuse/file.c:1002: warning: passing argument 3 of 'fuse_get_user_pages' from incompatible pointer type

This was introduced by commit f4975c67 "fuse: allow kernel to access
"direct_io" files".

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent f4efdd65

fs/fuse/file.c

+3 −3
Original line number Diff line number Diff line
@@ -938,9 +938,9 @@ static void fuse_release_user_pages(struct fuse_req *req, int write) 
}



static int fuse_get_user_pages(struct fuse_req *req, const char __user *buf,

			       unsigned *nbytesp, int write)

			       size_t *nbytesp, int write)

{

	unsigned nbytes = *nbytesp;

	size_t nbytes = *nbytesp;

	unsigned long user_addr = (unsigned long) buf;

	unsigned offset = user_addr & ~PAGE_MASK;

	int npages;
@@ -955,7 +955,7 @@ static int fuse_get_user_pages(struct fuse_req *req, const char __user *buf, 
		return 0;

	}



	nbytes = min(nbytes, (unsigned) FUSE_MAX_PAGES_PER_REQ << PAGE_SHIFT);

	nbytes = min_t(size_t, nbytes, FUSE_MAX_PAGES_PER_REQ << PAGE_SHIFT);

	npages = (nbytes + offset + PAGE_SIZE - 1) >> PAGE_SHIFT;

	npages = clamp(npages, 1, FUSE_MAX_PAGES_PER_REQ);

	down_read(&current->mm->mmap_sem);