dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix "direct_io" private mmap
  fuse: fix argument type in fuse_get_user_pages()
This commit is contained in:
Linus Torvalds 2009-04-14 10:12:07 -07:00
parent 9fc0178caa 3121bfe763
commit e9de427e40
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/fuse/file.c
View File

@ -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, 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 long user_addr = (unsigned long) buf;
unsigned offset = user_addr & ~PAGE_MASK; unsigned offset = user_addr & ~PAGE_MASK;
int npages; int npages;
@ -955,7 +955,7 @@ static int fuse_get_user_pages(struct fuse_req *req, const char __user *buf,
return 0; 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 = (nbytes + offset + PAGE_SIZE - 1) >> PAGE_SHIFT;
npages = clamp(npages, 1, FUSE_MAX_PAGES_PER_REQ); npages = clamp(npages, 1, FUSE_MAX_PAGES_PER_REQ);
down_read(&current->mm->mmap_sem); down_read(&current->mm->mmap_sem);
@ -1298,6 +1298,8 @@ static int fuse_direct_mmap(struct file *file, struct vm_area_struct *vma)
if (vma->vm_flags & VM_MAYSHARE) if (vma->vm_flags & VM_MAYSHARE)
return -ENODEV; return -ENODEV;
invalidate_inode_pages2(file->f_mapping);
return generic_file_mmap(file, vma); return generic_file_mmap(file, vma);
} }