X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=block%2Fioctl.c;h=e8eb679f2f9b19a7a6dacc4e1983c837345830dd;hb=3f7d7b4bded5bd2cc9934a2ed9a7ce68feb636b0;hp=8905d2a2a717c1adde73d0fb63014bb71271e4ae;hpb=3ae684e1c48e6deedc9b9faff8fa1c391ca8a652;p=net-next-2.6.git

diff --git a/block/ioctl.c b/block/ioctl.c
index 8905d2a2a71..e8eb679f2f9 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -126,7 +126,7 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
 	if (start + len > (bdev->bd_inode->i_size >> 9))
 		return -EINVAL;
 	return blkdev_issue_discard(bdev, start, len, GFP_KERNEL,
-				    DISCARD_FL_WAIT);
+				    BLKDEV_IFL_WAIT);
 }
 
 static int put_ushort(unsigned long arg, unsigned short val)