All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 06/21] ocfs2: drop vmtruncate
@ 2012-10-20 12:19 Marco Stornelli
  2012-10-23  8:54   ` Joel Becker
  0 siblings, 1 reply; 14+ messages in thread
From: Marco Stornelli @ 2012-10-20 12:19 UTC (permalink / raw)
  To: Linux FS Devel; +Cc: Mark Fasheh, Joel Becker, ocfs2-devel, linux-kernel

Removed vmtruncate

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

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 5a4ee77..eb16e44 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1172,6 +1172,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
 			status = -ENOSPC;
 			goto bail_unlock;
 		}
+		truncate_setsize(inode, attr->ia_size);
 	}
 
 	if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -1218,24 +1219,6 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
 		}
 	}
 
-	/*
-	 * This will intentionally not wind up calling truncate_setsize(),
-	 * since all the work for a size change has been done above.
-	 * Otherwise, we could get into problems with truncate as
-	 * ip_alloc_sem is used there to protect against i_size
-	 * changes.
-	 *
-	 * XXX: this means the conditional below can probably be removed.
-	 */
-	if ((attr->ia_valid & ATTR_SIZE) &&
-	    attr->ia_size != i_size_read(inode)) {
-		status = vmtruncate(inode, attr->ia_size);
-		if (status) {
-			mlog_errno(status);
-			goto bail_commit;
-		}
-	}
-
 	setattr_copy(inode, attr);
 	mark_inode_dirty(inode);
 
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2012-10-25  6:37 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-20 12:19 [PATCH 06/21] ocfs2: drop vmtruncate Marco Stornelli
2012-10-23  8:54 ` [Ocfs2-devel] " Joel Becker
2012-10-23  8:54   ` Joel Becker
2012-10-23  8:58   ` Marco Stornelli
2012-10-23  9:02     ` [Ocfs2-devel] " Joel Becker
2012-10-23  9:02       ` Joel Becker
2012-10-23 12:48       ` Marco Stornelli
2012-10-25  0:18         ` [Ocfs2-devel] " Joel Becker
2012-10-25  0:18           ` Joel Becker
2012-10-25  6:37           ` Marco Stornelli
2012-10-23 13:02   ` [Ocfs2-devel] " Christoph Hellwig
2012-10-23 13:02     ` Christoph Hellwig
2012-10-25  0:17     ` [Ocfs2-devel] " Joel Becker
2012-10-25  0:17       ` Joel Becker

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.