Commit 166f00bf authored by Chris Wright's avatar Chris Wright

[PATCH] fs/nfs/direct.c compile fix

Compile fix:

fs/nfs/direct.c: In function 'nfs_get_user_pages':
fs/nfs/direct.c:110: warning: implicit declaration of function 'nfs_free_user_pages'
fs/nfs/direct.c: At top level:
fs/nfs/direct.c:127: warning: conflicting types for 'nfs_free_user_pages'
fs/nfs/direct.c:127: error: static declaration of 'nfs_free_user_pages' follows non-static declaration
fs/nfs/direct.c:110: error: previous implicit declaration of 'nfs_free_user_pages' was here

This should now be the same as fix that's going upstream.
Signed-off-by: default avatarChris Wright <chrisw@sous-sol.org>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
parent e8dc2c9e
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
#define NFSDBG_FACILITY NFSDBG_VFS #define NFSDBG_FACILITY NFSDBG_VFS
#define MAX_DIRECTIO_SIZE (4096UL << PAGE_SHIFT) #define MAX_DIRECTIO_SIZE (4096UL << PAGE_SHIFT)
static void nfs_free_user_pages(struct page **pages, int npages, int do_dirty);
static kmem_cache_t *nfs_direct_cachep; static kmem_cache_t *nfs_direct_cachep;
/* /*
...@@ -106,12 +107,16 @@ nfs_get_user_pages(int rw, unsigned long user_addr, size_t size, ...@@ -106,12 +107,16 @@ nfs_get_user_pages(int rw, unsigned long user_addr, size_t size,
result = get_user_pages(current, current->mm, user_addr, result = get_user_pages(current, current->mm, user_addr,
page_count, (rw == READ), 0, page_count, (rw == READ), 0,
*pages, NULL); *pages, NULL);
up_read(&current->mm->mmap_sem);
/*
* If we got fewer pages than expected from get_user_pages(),
* the user buffer runs off the end of a mapping; return EFAULT.
*/
if (result >= 0 && result < page_count) { if (result >= 0 && result < page_count) {
nfs_free_user_pages(*pages, result, 0); nfs_free_user_pages(*pages, result, 0);
*pages = NULL; *pages = NULL;
result = -EFAULT; result = -EFAULT;
} }
up_read(&current->mm->mmap_sem);
} }
return result; return result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment