---

yaml --- r: 208328 b: refs/heads/master c: edca4a3 h: refs/heads/master v: v3
git-mirror · Aug 7, 2010 · 2f4c7fc · 2f4c7fc
1 parent 3ac5f7b
commit 2f4c7fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 }