summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNikolay Borisov <kernel@kyup.com>2015-07-02 01:32:44 -0400
committerZefan Li <lizefan@huawei.com>2016-03-21 09:17:40 +0800
commite47e85894f5db4049982296a46526a2aab78fd51 (patch)
treedda302bb17a28711cda5b14ace930aa6eaffa826 /include
parent9810a13f3e3fe2ba25fcd1fb6a8bd06e752998c2 (diff)
bufferhead: Add _gfp version for sb_getblk()
commit bd7ade3cd9b0850264306f5c2b79024a417b6396 upstream. sb_getblk() is used during ext4 (and possibly other FSes) writeback paths. Sometimes such path require allocating memory and guaranteeing that such allocation won't block. Currently, however, there is no way to provide user flags for sb_getblk which could lead to deadlocks. This patch implements a sb_getblk_gfp with the only difference it can accept user-provided GFP flags. Signed-off-by: Nikolay Borisov <kernel@kyup.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/buffer_head.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 1738420c5b5a..fed3f3ac489d 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -308,6 +308,13 @@ sb_getblk(struct super_block *sb, sector_t block)
return __getblk_gfp(sb->s_bdev, block, sb->s_blocksize, __GFP_MOVABLE);
}
+
+static inline struct buffer_head *
+sb_getblk_gfp(struct super_block *sb, sector_t block, gfp_t gfp)
+{
+ return __getblk_gfp(sb->s_bdev, block, sb->s_blocksize, gfp);
+}
+
static inline struct buffer_head *
sb_find_get_block(struct super_block *sb, sector_t block)
{