From patchwork Wed Nov 17 04:23:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 330701 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAH4OCWS014302 for ; Wed, 17 Nov 2010 04:24:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932967Ab0KQEXx (ORCPT ); Tue, 16 Nov 2010 23:23:53 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:50946 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1759116Ab0KQEXh (ORCPT ); Tue, 16 Nov 2010 23:23:37 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id CD42A1710AA; Wed, 17 Nov 2010 12:23:34 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id oAH4J6tH020642; Wed, 17 Nov 2010 12:19:08 +0800 Received: from [10.167.225.64] ([10.167.225.64]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2010111712235584-30755 ; Wed, 17 Nov 2010 12:23:55 +0800 Message-ID: <4CE358C7.3040902@cn.fujitsu.com> Date: Wed, 17 Nov 2010 12:23:35 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: Josef Bacik , Chris Mason CC: Linux Btrfs , Linux Kernel , Linux Fsdevel , Andrew Morton , Ito Subject: [PATCH 3/3] btrfs: fix panic caused by direct IO X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-11-17 12:23:55, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-11-17 12:23:58, Serialize complete at 2010-11-17 12:23:58 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 (demeter1.kernel.org [140.211.167.41]); Wed, 17 Nov 2010 04:24:13 +0000 (UTC) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 32b68fa..341d080 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5689,6 +5689,20 @@ static int __btrfs_submit_bio_start_direct_io(struct inode *inode, int rw, return 0; } +/* + * This function is used to check the chunk tree when doing direct IO because + * btrfs can't create bios that span stripes or chunks. + */ +static int btrfs_can_merge_page_dio(size_t size, struct inode *inode, + struct bio *bio) +{ + struct btrfs_root *root = BTRFS_I(inode)->root; + struct btrfs_mapping_tree *map_tree; + + map_tree = &root->fs_info->mapping_tree; + return __btrfs_can_merge_page_to_bio(map_tree, size, bio); +} + static void btrfs_submit_direct(int rw, struct bio *bio, struct inode *inode, loff_t file_offset) { @@ -5873,7 +5887,7 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, ret = __blockdev_direct_IO(rw, iocb, inode, BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev, iov, offset, nr_segs, btrfs_get_blocks_direct, NULL, - btrfs_submit_direct, NULL, 0); + btrfs_submit_direct, btrfs_can_merge_page_dio, 0); if (ret < 0 && ret != -EIOCBQUEUED) { clear_extent_bit(&BTRFS_I(inode)->io_tree, offset,