All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 16/21] minix: drop vmtruncate
@ 2012-08-31 14:00 Marco Stornelli
  0 siblings, 0 replies; only message in thread
From: Marco Stornelli @ 2012-08-31 14:00 UTC (permalink / raw)
  To: Linux FS Devel; +Cc: Guenter Roeck, Luca Tettamanti, linux-kernel

Removed vmtruncate.

Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
---
 fs/minix/file.c  |    6 ++++--
 fs/minix/inode.c |    7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fs/minix/file.c b/fs/minix/file.c
index 4493ce6..adc6f54 100644
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -34,9 +34,12 @@ static int minix_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if ((attr->ia_valid & ATTR_SIZE) &&
 	    attr->ia_size != i_size_read(inode)) {
-		error = vmtruncate(inode, attr->ia_size);
+		error = inode_newsize_ok(inode, attr->ia_size);
 		if (error)
 			return error;
+
+		truncate_setsize(inode, attr->ia_size);
+		minix_truncate(inode);
 	}
 
 	setattr_copy(inode, attr);
@@ -45,7 +48,6 @@ static int minix_setattr(struct dentry *dentry, struct iattr *attr)
 }
 
 const struct inode_operations minix_file_inode_operations = {
-	.truncate	= minix_truncate,
 	.setattr	= minix_setattr,
 	.getattr	= minix_getattr,
 };
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 2a503ad..0837568 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -400,8 +400,11 @@ static int minix_write_begin(struct file *file, struct address_space *mapping,
 				minix_get_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);
+			minix_truncate(mapping->host);
+		}
 	}
 
 	return ret;
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-08-31 14:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-31 14:00 [PATCH 16/21] minix: drop vmtruncate Marco Stornelli

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.