aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKen Chen <kenchen@google.com>2007-10-16 04:26:21 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:02 -0400
commit7aa91e104028b87ff13f5eeb7a0d7ffe7b5a2348 (patch)
treee6084d025a03e3b097c0a710e50fcae1d82f2fba /fs
parent54f9f80d6543fb7b157d3b11e2e7911dc1379790 (diff)
hugetlb: allow extending ftruncate on hugetlbfs
For historical reason, expanding ftruncate that increases file size on hugetlbfs is not allowed due to pages were pre-faulted and lack of fault handler. Now that we have demand faulting on hugetlb since 2.6.15, there is no reason to hold back that limitation. This will make hugetlbfs behave more like a normal fs. I'm writing a user level code that uses hugetlbfs but will fall back to tmpfs if there are no hugetlb page available in the system. Having hugetlbfs specific ftruncate behavior is a bit quirky and I would like to remove that artificial limitation. Signed-off-by: <kenchen@google.com> Acked-by: Wiliam Irwin <wli@holomorphy.com> Cc: Adam Litke <agl@us.ibm.com> Cc: David Gibson <david@gibson.dropbear.id.au> Cc: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/hugetlbfs/inode.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 70fbb29fb202..8f8e13385e96 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -322,21 +322,15 @@ hugetlb_vmtruncate_list(struct prio_tree_root *root, pgoff_t pgoff)
322 } 322 }
323} 323}
324 324
325/*
326 * Expanding truncates are not allowed.
327 */
328static int hugetlb_vmtruncate(struct inode *inode, loff_t offset) 325static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)
329{ 326{
330 pgoff_t pgoff; 327 pgoff_t pgoff;
331 struct address_space *mapping = inode->i_mapping; 328 struct address_space *mapping = inode->i_mapping;
332 329
333 if (offset > inode->i_size)
334 return -EINVAL;
335
336 BUG_ON(offset & ~HPAGE_MASK); 330 BUG_ON(offset & ~HPAGE_MASK);
337 pgoff = offset >> PAGE_SHIFT; 331 pgoff = offset >> PAGE_SHIFT;
338 332
339 inode->i_size = offset; 333 i_size_write(inode, offset);
340 spin_lock(&mapping->i_mmap_lock); 334 spin_lock(&mapping->i_mmap_lock);
341 if (!prio_tree_empty(&mapping->i_mmap)) 335 if (!prio_tree_empty(&mapping->i_mmap))
342 hugetlb_vmtruncate_list(&mapping->i_mmap, pgoff); 336 hugetlb_vmtruncate_list(&mapping->i_mmap, pgoff);