summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibin <huawei.libin@huawei.com>2013-07-03 15:01:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:26 -0700
commitef9f515a4c38c759c56c7d1e760cc243b6d516f4 (patch)
treeea35e5d7f3202af53f990e8f5dc87ddfaac7e32c
parentd6e932177090463e5c709e9e61bbd705a33a1609 (diff)
downloadop-kernel-dev-ef9f515a4c38c759c56c7d1e760cc243b6d516f4.zip
op-kernel-dev-ef9f515a4c38c759c56c7d1e760cc243b6d516f4.tar.gz
ncpfs: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
(*->vm_end - *->vm_start) >> PAGE_SHIFT operation is implemented as a inline funcion vma_pages() in linux/mm.h, so using it. Signed-off-by: Libin <huawei.libin@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ncpfs/mmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c
index ee24df5..3c5dd55 100644
--- a/fs/ncpfs/mmap.c
+++ b/fs/ncpfs/mmap.c
@@ -117,7 +117,7 @@ int ncp_mmap(struct file *file, struct vm_area_struct *vma)
return -EINVAL;
/* we do not support files bigger than 4GB... We eventually
supports just 4GB... */
- if (((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff
+ if (vma_pages(vma) + vma->vm_pgoff
> (1U << (32 - PAGE_SHIFT)))
return -EFBIG;
OpenPOWER on IntegriCloud