linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] fs: fix iversion handling
@ 2013-11-19 15:17 Christoph Hellwig
  2013-12-02 17:36 ` Christoph Hellwig
                   ` (2 more replies)
  0 siblings, 3 replies; 13+ messages in thread
From: Christoph Hellwig @ 2013-11-19 15:17 UTC (permalink / raw)
  To: linux-fsdevel, xfs

Currently notify_change directly updates i_version for size updates,
which not only is counter to how all other fields are updated through
struct iattr, but also breaks XFS, which need inode updates to happen
under its own lock, and synchronized to the structure that gets written
to the log.

Remove the update in the common code, and it to btrfs and ext4,
XFS already does a proper updaste internally and currently gets a
double update with the existing code.

IMHO this is 3.13 and -stable material and should go in through the XFS
tree.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfs/fs/attr.c
===================================================================
--- xfs.orig/fs/attr.c	2013-11-19 16:08:42.275415189 +0100
+++ xfs/fs/attr.c	2013-11-19 16:08:51.803414994 +0100
@@ -182,11 +182,6 @@ int notify_change(struct dentry * dentry
 			return -EPERM;
 	}
 
-	if ((ia_valid & ATTR_SIZE) && IS_I_VERSION(inode)) {
-		if (attr->ia_size != inode->i_size)
-			inode_inc_iversion(inode);
-	}
-
 	if ((ia_valid & ATTR_MODE)) {
 		umode_t amode = attr->ia_mode;
 		/* Flag setting protected by i_mutex */
Index: xfs/fs/btrfs/inode.c
===================================================================
--- xfs.orig/fs/btrfs/inode.c	2013-11-19 16:08:42.275415189 +0100
+++ xfs/fs/btrfs/inode.c	2013-11-19 16:08:51.803414994 +0100
@@ -4345,8 +4345,12 @@ static int btrfs_setsize(struct inode *i
 	 * these flags set.  For all other operations the VFS set these flags
 	 * explicitly if it wants a timestamp update.
 	 */
-	if (newsize != oldsize && (!(mask & (ATTR_CTIME | ATTR_MTIME))))
-		inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);
+	if (newsize != oldsize) {
+		inode_inc_iversion(inode);
+		if (!(mask & (ATTR_CTIME | ATTR_MTIME)))
+			inode->i_ctime = inode->i_mtime =
+				current_fs_time(inode->i_sb);
+	}
 
 	if (newsize > oldsize) {
 		truncate_pagecache(inode, newsize);
Index: xfs/fs/ext4/inode.c
===================================================================
--- xfs.orig/fs/ext4/inode.c	2013-11-19 16:08:42.275415189 +0100
+++ xfs/fs/ext4/inode.c	2013-11-19 16:08:51.803414994 +0100
@@ -4594,6 +4594,10 @@ int ext4_setattr(struct dentry *dentry,
 			if (attr->ia_size > sbi->s_bitmap_maxbytes)
 				return -EFBIG;
 		}
+
+		if (IS_I_VERSION(inode) && attr->ia_size != inode->i_size)
+			inode_inc_iversion(inode);
+
 		if (S_ISREG(inode->i_mode) &&
 		    (attr->ia_size < inode->i_size)) {
 			if (ext4_should_order_data(inode)) {

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

end of thread, other threads:[~2013-12-05 22:37 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-19 15:17 [PATCH] fs: fix iversion handling Christoph Hellwig
2013-12-02 17:36 ` Christoph Hellwig
2013-12-02 22:05   ` Andreas Dilger
2013-12-03  9:39     ` Christoph Hellwig
2013-12-02 22:11   ` Jan Kara
     [not found]   ` <20131202173636.GA17724-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2013-12-03  9:35     ` Boaz Harrosh
2013-12-03  9:45       ` Christoph Hellwig
     [not found]         ` <20131203094507.GD4906-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2013-12-03 10:40           ` Boaz Harrosh
     [not found]             ` <529DB536.7050008-C4P08NqkoRlBDgjK7y7TUQ@public.gmane.org>
2013-12-03 20:54               ` J. Bruce Fields
2013-12-02 23:25 ` Dave Chinner
2013-12-04 21:25 ` Ben Myers
2013-12-04 22:01   ` Chris Mason
2013-12-05 22:37     ` Ben Myers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).