Skip to contentSkip to conversation

ufs: drop vmtruncate

PATCH In review Marco Stornelli 2 participants 2 messages Oct 6, 2012 – Oct 13, 2012 VFS

lore
Share & tools
lore

Marco Stornelli

author
#0 lore raw

PATCH 1/22 ufs: drop vmtruncate

Removed vmtruncate.

Signed-off-by Marco Stornelli <[email protected]>
---
 fs/ufs/inode.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
fs/ufs/inode.c +3 -2
index eb6d0b7..2b43ce9 100644
@@ -536,8 +536,9 @@ static int ufs_write_begin(struct file *file, struct address_space *mapping,
 				ufs_getfrag_block);
 	if (unlikely(ret)) {
 		loff_t isize = mapping->host->i_size;
-		if (pos + len > isize)
-			vmtruncate(mapping->host, isize);
+		if ((pos + len > isize) &&
+			inode_newsize_ok(mapping->host, isize) == 0)
+			truncate_setsize(mapping->host, isize);
 	}
 
 	return ret;
Signature · 1 line
1.7.3.4
#1 lore raw

fs/ufs/inode.c static int ufs_write_begin(struct file *file, struct address_space *mapping, · line 541

Quoted 9 lines
fs/ufs/inode.c +3 -2
@@ -536,8 +536,9 @@ static int ufs_write_begin(struct file *file, struct address_space *mapping,
 				ufs_getfrag_block);
 	if (unlikely(ret)) {
 		loff_t isize = mapping->host->i_size;
-		if (pos + len > isize)
-			vmtruncate(mapping->host, isize);
+		if ((pos + len > isize) &&
+			inode_newsize_ok(mapping->host, isize) == 0)
+			truncate_setsize(mapping->host, isize);

write_begin always truncates down, so there should be no call to inode_newsize_ok here.