diff --git a/[refs] b/[refs]
index 76332f2f0c9f..bd09ef9632c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6c4c8e19a087dae7dc651ccbd1ff8b843eedee2
+refs/heads/master: edca4a380584a65a16839bdee33ec82244f0f88e
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index a8b05fc80c6d..89c855c5655c 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -933,7 +933,7 @@ static inline int sb_issue_discard(struct super_block *sb,
 {
 	block <<= (sb->s_blocksize_bits - 9);
 	nr_blocks <<= (sb->s_blocksize_bits - 9);
-	return blkdev_issue_discard(sb->s_bdev, block, nr_blocks, GFP_KERNEL,
+	return blkdev_issue_discard(sb->s_bdev, block, nr_blocks, GFP_NOFS,
 				   BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
 }