From 4a3fabd830475f6d2440de4194b940428d5c40e6 Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fusionio.com>
Date: Thu, 21 Feb 2013 15:28:28 -0500
Subject: [PATCH] --- yaml --- r: 360482 b: refs/heads/master c:
 f2bdf9a8f79052e9577936cbe5696c0e232aa0e3 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36c8018d06e8..fbeb673b86fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc81cdc58ad2f413b96b9004f8d681e5dc554473
+refs/heads/master: f2bdf9a8f79052e9577936cbe5696c0e232aa0e3
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 40d49da5e846..14c82cdbb696 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -5574,7 +5574,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 		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;
+			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW |
+				BTRFS_INODE_NODATASUM;
 	}
 
 	insert_inode_hash(inode);