Skip to content

Commit

Permalink
NFS: Fix handful of compiler warnings in direct.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chuck Lever authored and Trond Myklebust committed May 24, 2007
1 parent 7fe7f84 commit 749e146
Showing 1 changed file with 16 additions and 10 deletions.
26 changes: 16 additions & 10 deletions fs/nfs/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,19 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_
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++) {
struct page *page = pages[i];
if (!PageCompound(page))
set_page_dirty_lock(page);
}
}

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++)
page_cache_release(pages[i]);
}
Expand Down Expand Up @@ -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,
data->npages, 1, 0, data->pagevec, NULL);
up_read(&current->mm->mmap_sem);
if (unlikely(result < data->npages)) {
if (result > 0)
nfs_direct_release_pages(data->pagevec, result);
if (result < 0) {
nfs_readdata_release(data);
break;
}
if ((unsigned)result < data->npages) {
nfs_direct_release_pages(data->pagevec, result);
nfs_readdata_release(data);
break;
}
Expand Down Expand Up @@ -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,
data->npages, 0, 0, data->pagevec, NULL);
up_read(&current->mm->mmap_sem);
if (unlikely(result < data->npages)) {
if (result > 0)
nfs_direct_release_pages(data->pagevec, result);
if (result < 0) {
nfs_writedata_release(data);
break;
}
if ((unsigned)result < data->npages) {
nfs_direct_release_pages(data->pagevec, result);
nfs_writedata_release(data);
break;
}
Expand Down

0 comments on commit 749e146

Please sign in to comment.