projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
fs
/
btrfs
/
file-item.c
diff --git
a/fs/btrfs/file-item.c
b/fs/btrfs/file-item.c
index
7a7d6e2
..
62a81ee
100644
(file)
--- a/
fs/btrfs/file-item.c
+++ b/
fs/btrfs/file-item.c
@@
-248,7
+248,7
@@
static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
BTRFS_DATA_RELOC_TREE_OBJECTID) {
set_extent_bits(io_tree, offset,
offset + root->sectorsize - 1,
- EXTENT_NODATASUM
, GFP_NOFS
);
+ EXTENT_NODATASUM);
} else {
btrfs_info(BTRFS_I(inode)->root->fs_info,
"no csum found for inode %llu start %llu",