summaryrefslogtreecommitdiff
path: root/fs/btrfs/file-item.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-05-25 23:51:03 +0300
committerDavid Sterba <dsterba@suse.com>2016-05-25 23:51:03 +0300
commit42f31734eb7658fd01fb186d56312be869450a42 (patch)
treeb2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/file-item.c
parente73440868fde7cce4a93583a4fa2db9a8938a7ed (diff)
parent0132761017e012ab4dc8584d679503f2ba26ca86 (diff)
downloadlinux-42f31734eb7658fd01fb186d56312be869450a42.tar.xz
Merge branch 'cleanups-4.7' into for-chris-4.7-20160525
Diffstat (limited to 'fs/btrfs/file-item.c')
-rw-r--r--fs/btrfs/file-item.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 7a7d6e253cfc..62a81ee13a5f 100644
--- 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",