All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marco Stornelli <marco.stornelli@gmail.com>
To: Linux FS Devel <linux-fsdevel@vger.kernel.org>
Cc: Bob Copeland <me@bobcopeland.com>,
	linux-karma-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org
Subject: [PATCH 05/21] omfs: drop vmtruncate
Date: Fri, 31 Aug 2012 15:53:43 +0200	[thread overview]
Message-ID: <5040C1E7.4060108@gmail.com> (raw)

Removed vmtruncate.

Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
---
 fs/omfs/file.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 2c6d952..2139ee9 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -317,8 +317,11 @@ static int omfs_write_begin(struct file *file, struct address_space *mapping,
 				omfs_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);
+			omfs_truncate(mapping->host);
+		}
 	}
 
 	return ret;
@@ -351,9 +354,11 @@ static int omfs_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);
+		omfs_truncate(inode);
 	}
 
 	setattr_copy(inode, attr);
@@ -363,7 +368,6 @@ static int omfs_setattr(struct dentry *dentry, struct iattr *attr)
 
 const struct inode_operations omfs_file_inops = {
 	.setattr = omfs_setattr,
-	.truncate = omfs_truncate
 };
 
 const struct address_space_operations omfs_aops = {
-- 
1.7.3.4

             reply	other threads:[~2012-08-31 13:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-31 13:53 Marco Stornelli [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-10-20 12:18 [PATCH 05/21] omfs: drop vmtruncate Marco Stornelli
2012-10-20 12:18 ` Marco Stornelli
2012-11-03  9:24 Marco Stornelli
2012-11-03  9:24 ` Marco Stornelli
2012-11-07 13:28 ` Bob Copeland
2012-12-15 10:49 Marco Stornelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5040C1E7.4060108@gmail.com \
    --to=marco.stornelli@gmail.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-karma-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=me@bobcopeland.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.