Skip to contentSkip to conversation

hostfs: drop vmtruncate

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

Subsystems (2)
VFS User-mode Linux (UML)
lore
Share & tools
lore

Marco Stornelli

author
#0 lore raw

PATCH 14/22 hostfs: drop vmtruncate

Removed vmtruncate.

Signed-off-by Marco Stornelli <[email protected]>
---
 fs/hostfs/hostfs_kern.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
fs/hostfs/hostfs_kern.c +5 -3
index 6c9f3a9..4348e84 100644
@@ -848,9 +848,11 @@ int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
 	    attr->ia_size != i_size_read(inode)) {
 		int error;
 
-		error = vmtruncate(inode, attr->ia_size);
-		if (err)
-			return err;
+		error = inode_newsize_ok(inode, attr->ia_size);
+		if (error)
+			return error;
+
+		truncate_setsize(inode, attr->ia_size);
 	}
 
 	setattr_copy(inode, attr);
Signature · 1 line
1.7.3.4
#1 lore raw

fs/hostfs/hostfs_kern.c int hostfs_setattr(struct dentry *dentry, struct iattr *attr) · line 855

Quoted 13 lines

+++ b/fs/hostfs/hostfs_kern.c

fs/hostfs/hostfs_kern.c +5 -3
@@ -848,9 +848,11 @@ int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
 	    attr->ia_size != i_size_read(inode)) {
 		int error;
 
-		error = vmtruncate(inode, attr->ia_size);
-		if (err)
-			return err;
+		error = inode_newsize_ok(inode, attr->ia_size);
+		if (error)
+			return error;
+
+		truncate_setsize(inode, attr->ia_size);

The inode_change_ok call here is superflous, it's already done by inode_change_ok at the beginning of the function. Even if that wasn't done doing it aftet set_attr() would be too late anyway.