Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94272164 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: honor nodatacow/sum mount options for new files 



The btrfs attr patches unconditionally inherited the inode flags field
without honoring nodatacow and nodatasum.  This fix makes sure
we properly record the nodatacow/sum mount options in new inodes.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 2c47e605

fs/btrfs/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -3587,12 +3587,6 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, 
		owner = 1;

	BTRFS_I(inode)->block_group =

			btrfs_find_block_group(root, 0, alloc_hint, owner);

	if ((mode & S_IFREG)) {

		if (btrfs_test_opt(root, NODATASUM))

			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;

		if (btrfs_test_opt(root, NODATACOW))

			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;

	}



	key[0].objectid = objectid;

	btrfs_set_key_type(&key[0], BTRFS_INODE_ITEM_KEY);
@@ -3647,6 +3641,13 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, 


	btrfs_inherit_iflags(inode, dir);



	if ((mode & S_IFREG)) {

		if (btrfs_test_opt(root, NODATASUM))

			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;

		if (btrfs_test_opt(root, NODATACOW))

			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;

	}



	insert_inode_hash(inode);

	inode_tree_add(inode);

	return inode;