From patchwork Sun Jun 13 03:51:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Ursetto X-Patchwork-Id: 105760 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5D3ptvE019051 for ; Sun, 13 Jun 2010 03:51:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753117Ab0FMDvu (ORCPT ); Sat, 12 Jun 2010 23:51:50 -0400 Received: from qmta05.emeryville.ca.mail.comcast.net ([76.96.30.48]:45377 "EHLO qmta05.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045Ab0FMDvu (ORCPT ); Sat, 12 Jun 2010 23:51:50 -0400 Received: from omta22.emeryville.ca.mail.comcast.net ([76.96.30.89]) by qmta05.emeryville.ca.mail.comcast.net with comcast id VFKg1e0041vN32cA5Frp2m; Sun, 13 Jun 2010 03:51:49 +0000 Received: from allie.xorinia.dim ([24.13.211.72]) by omta22.emeryville.ca.mail.comcast.net with comcast id VFro1e00F1aGSPL8iFro80; Sun, 13 Jun 2010 03:51:49 +0000 Received: by allie.xorinia.dim (Postfix, from userid 1000) id 06426FC206; Sat, 12 Jun 2010 22:51:47 -0500 (CDT) Date: Sat, 12 Jun 2010 22:51:47 -0500 From: Jim Ursetto To: linux-btrfs@vger.kernel.org Subject: Re: dkms build error Message-ID: <20100613035147.GC16863@3e8.org> Reply-To: Jim Ursetto MIME-Version: 1.0 Content-Disposition: inline X-System: Linux allie 2.6.35-2-server X-URL: http://3e8.org User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 13 Jun 2010 03:51:56 +0000 (UTC) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index b34d32f..c6a4f45 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1589,7 +1589,7 @@ static void btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len) { blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL, - DISCARD_FL_BARRIER); + BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); } static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,