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.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[cascardo/linux.git]
/
fs
/
btrfs
/
ctree.h
diff --git
a/fs/btrfs/ctree.h
b/fs/btrfs/ctree.h
index
a0165c6
..
35489e7
100644
(file)
--- a/
fs/btrfs/ctree.h
+++ b/
fs/btrfs/ctree.h
@@
-3367,7
+3367,7
@@
static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)
static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)
{
- return mapping_gfp_
mask(mapping) & ~__GFP_FS
;
+ return mapping_gfp_
constraint(mapping, ~__GFP_FS)
;
}
/* extent-tree.c */