AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 12:20:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFS: Fix handful of compiler warnings in direct.c

Browse Source 
This patch fixes a couple of signage issues that were causing an Oops
when running the LTP diotest4 test. get_user_pages() returns a signed
error, hence we need to be careful when comparing with the unsigned
number of pages from data->npages.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-05-19 17:22:46 -04:00 committed by Trond Myklebust
parent 7fe7f8487a
commit 749e146e01
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/nfs/direct.c
View File

@ -122,9 +122,9 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_
return -EINVAL; return -EINVAL;
} }
static void nfs_direct_dirty_pages(struct page **pages, int npages) static void nfs_direct_dirty_pages(struct page **pages, unsigned int npages)
{ {
int i; unsigned int i;
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
struct page *page = pages[i]; struct page *page = pages[i];
if (!PageCompound(page)) if (!PageCompound(page))
@ -132,9 +132,9 @@ static void nfs_direct_dirty_pages(struct page **pages, int npages)
} }
} }
static void nfs_direct_release_pages(struct page **pages, int npages) static void nfs_direct_release_pages(struct page **pages, unsigned int npages)
{ {
int i; unsigned int i;
for (i = 0; i < npages; i++) for (i = 0; i < npages; i++)
page_cache_release(pages[i]); page_cache_release(pages[i]);
} }
@ -279,9 +279,12 @@ static ssize_t nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned lo
result = get_user_pages(current, current->mm, user_addr, result = get_user_pages(current, current->mm, user_addr,
data->npages, 1, 0, data->pagevec, NULL); data->npages, 1, 0, data->pagevec, NULL);
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
if (unlikely(result < data->npages)) { if (result < 0) {
if (result > 0) nfs_readdata_release(data);
nfs_direct_release_pages(data->pagevec, result); break;
}
if ((unsigned)result < data->npages) {
nfs_direct_release_pages(data->pagevec, result);
nfs_readdata_release(data); nfs_readdata_release(data);
break; break;
} }
@ -610,9 +613,12 @@ static ssize_t nfs_direct_write_schedule(struct nfs_direct_req *dreq, unsigned l
result = get_user_pages(current, current->mm, user_addr, result = get_user_pages(current, current->mm, user_addr,
data->npages, 0, 0, data->pagevec, NULL); data->npages, 0, 0, data->pagevec, NULL);
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
if (unlikely(result < data->npages)) { if (result < 0) {
if (result > 0) nfs_writedata_release(data);
nfs_direct_release_pages(data->pagevec, result); break;
}
if ((unsigned)result < data->npages) {
nfs_direct_release_pages(data->pagevec, result);
nfs_writedata_release(data); nfs_writedata_release(data);
break; break;
} }