Commit 3763771c authored Jun 12, 2019 by Filipe Manana Committed by David Sterba Jun 17, 2019

Btrfs: fix failure to persist compression property xattr deletion on fsync

After the recent series of cleanups in the properties and xattrs modules
that landed in the 5.2 merge window, we ended up with a regression where
after deleting the compression xattr property through the setflags ioctl,
we don't set the BTRFS_INODE_COPY_EVERYTHING flag in the inode anymore.
As a consequence, if the inode was fsync'ed when it had the compression
property set, after deleting the compression property through the setflags
ioctl and fsync'ing again the inode, the log will still contain the
compression xattr, because the inode did not had that bit set, which
made the fsync not delete all xattrs from the log and copy all xattrs
from the subvolume tree to the log tree.

This regression happens due to the fact that that series of cleanups
made btrfs_set_prop() call the old function do_setxattr() (which is now
named btrfs_setxattr()), and not the old version of btrfs_setxattr(),
which is now called btrfs_setxattr_trans().

Fix this by setting the BTRFS_INODE_COPY_EVERYTHING bit in the current
btrfs_setxattr() function and remove it from everywhere else, including
its setup at btrfs_ioctl_setflags(). This is cleaner, avoids similar
regressions in the future, and centralizes the setup of the bit. After
all, the need to setup this bit should only be in the xattrs module,
since it is an implementation of xattrs.

Fixes: 04e6863b ("btrfs: split btrfs_setxattr calls regarding transaction")
CC: stable@vger.kernel.org # 4.4+
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent c4e0540d

fs/btrfs/ioctl.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -312,8 +312,6 @@ static int btrfs_ioctl_setflags(struct file file, void __user arg)
		btrfs_abort_transaction(trans, ret);
		goto out_end_trans;
		}
		set_bit(BTRFS_INODE_COPY_EVERYTHING,
		&BTRFS_I(inode)->runtime_flags);
		} else {
		ret = btrfs_set_prop(trans, inode, "btrfs.compression", NULL,
		0, 0);

fs/btrfs/xattr.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -213,6 +213,9 @@ int btrfs_setxattr(struct btrfs_trans_handle trans, struct inode inode,
		}
		out:
		btrfs_free_path(path);
		if (!ret)
		set_bit(BTRFS_INODE_COPY_EVERYTHING,
		&BTRFS_I(inode)->runtime_flags);
		return ret;
		}

		@@ -236,7 +239,6 @@ int btrfs_setxattr_trans(struct inode inode, const char name,

		inode_inc_iversion(inode);
		inode->i_ctime = current_time(inode);
		set_bit(BTRFS_INODE_COPY_EVERYTHING, &BTRFS_I(inode)->runtime_flags);
		ret = btrfs_update_inode(trans, root, inode);
		BUG_ON(ret);
		out:
		@@ -388,8 +390,6 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
		if (!ret) {
		inode_inc_iversion(inode);
		inode->i_ctime = current_time(inode);
		set_bit(BTRFS_INODE_COPY_EVERYTHING,
		&BTRFS_I(inode)->runtime_flags);
		ret = btrfs_update_inode(trans, root, inode);
		BUG_ON(ret);
		}

Admin message