summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Borisov <kernel@kyup.com>2015-07-02 01:32:44 -0400
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:19 +0200
commit786d7b3d2d1096c893e0fda85126c3972c98b027 (patch)
tree31204c46b34d41173f8fb24dd2d792d5ac25a2f1
parent74e9374ed552160261e29647bf6e1907cdd27523 (diff)
downloadlinux-stable-786d7b3d2d1096c893e0fda85126c3972c98b027.tar.gz
linux-stable-786d7b3d2d1096c893e0fda85126c3972c98b027.tar.bz2
linux-stable-786d7b3d2d1096c893e0fda85126c3972c98b027.zip
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: Ben Hutchings <ben@decadent.org.uk>
-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)
{