Skip to contentSkip to conversation

Patch "Btrfs: disable xattr operations on subvolume directories" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 30, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Btrfs: disable xattr operations on subvolume directories

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
btrfs-disable-xattr-operations-on-subvolume-directories.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 1fdf41941b8010691679638f8d0c8d08cfee7726 Mon Sep 17 00:00:00 2001

From: Omar Sandoval <[email protected]>
Date: Wed, 25 Jan 2017 17:06:39 -0800
Subject: Btrfs: disable xattr operations on subvolume directories

From: Omar Sandoval <[email protected]>

commit 1fdf41941b8010691679638f8d0c8d08cfee7726 upstream.

When you snapshot a subvolume containing a subvolume, you get a placeholder directory where the subvolume would be. These directory inodes have ->i_ops set to btrfs_dir_ro_inode_operations. Previously, these i_ops didn't include the xattr operation callbacks. The conversion to xattr_handlers missed this case, leading to bogus attempts to set xattrs on these inodes. This manifested itself as failures when running delayed inodes.

To fix this, clear IOP_XATTR in ->i_opflags on these inodes.

Fixes 6c6ef9f26e59 ("xattr: Stop calling {get,set,remove}xattr inode operations")
Cc Andreas Gruenbacher <[email protected]>
---
 fs/btrfs/inode.c |    1 +
 1 file changed, 1 insertion(+)
fs/btrfs/inode.c +1 -0
@@ -5679,6 +5679,7 @@ static struct inode *new_simple_dir(stru
 
 	inode->i_ino = BTRFS_EMPTY_SUBVOL_DIR_OBJECTID;
 	inode->i_op = &btrfs_dir_ro_inode_operations;
+	inode->i_opflags &= ~IOP_XATTR;
 	inode->i_fop = &simple_dir_operations;
 	inode->i_mode = S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO;
 	inode->i_mtime = current_time(inode);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/btrfs-remove-get-set-_acl-from-btrfs_dir_ro_inode_operations.patch queue-4.9/btrfs-disable-xattr-operations-on-subvolume-directories.patch queue-4.9/btrfs-remove-old-tree_root-case-in-btrfs_read_locked_inode.patch