diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 3f5525f0834c687b36a3e0169bfb74907ba6ed49..5d537f26dc832557bb4df79e3d9cd4e579b2cd5f 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -863,6 +863,14 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
 	first_index = pos >> PAGE_CACHE_SHIFT;
 	last_index = (pos + count) >> PAGE_CACHE_SHIFT;
 
+	/*
+	 * if this is a nodatasum mount, force summing off for the inode
+	 * all the time.  That way a later mount with summing on won't
+	 * get confused
+	 */
+	if (btrfs_test_opt(root, NODATASUM))
+		btrfs_set_flag(inode, NODATASUM);
+
 	/*
 	 * there are lots of better ways to do this, but this code
 	 * makes sure the first and last page in the file range are