From patchwork Tue Jan 19 21:58:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jim owens X-Patchwork-Id: 73952 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0JLwvx4027888 for ; Tue, 19 Jan 2010 21:58:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754326Ab0ASV6z (ORCPT ); Tue, 19 Jan 2010 16:58:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754330Ab0ASV6y (ORCPT ); Tue, 19 Jan 2010 16:58:54 -0500 Received: from g6t0184.atlanta.hp.com ([15.193.32.61]:34391 "EHLO g6t0184.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754315Ab0ASV6x (ORCPT ); Tue, 19 Jan 2010 16:58:53 -0500 Received: from g5t0029.atlanta.hp.com (g5t0029.atlanta.hp.com [16.228.8.141]) by g6t0184.atlanta.hp.com (Postfix) with ESMTP id 4F2D0C11C for ; Tue, 19 Jan 2010 21:58:53 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g5t0029.atlanta.hp.com (Postfix) with ESMTP id 3F9D220218 for ; Tue, 19 Jan 2010 21:58:53 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 40B6ECF0017; Tue, 19 Jan 2010 14:58:53 -0700 (MST) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9Nuj17FppV9w; Tue, 19 Jan 2010 14:58:53 -0700 (MST) Received: from [192.168.0.99] (squirrel.fc.hp.com [15.11.146.57]) (Authenticated sender: owens@fc.hp.com) by ldl (Postfix) with ESMTPA id C2C9DCF0012; Tue, 19 Jan 2010 14:58:52 -0700 (MST) Message-ID: <4B562B1B.4010502@hp.com> Date: Tue, 19 Jan 2010 16:58:51 -0500 From: jim owens User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: linux-btrfs Subject: [RFC PATCH 03/03] Btrfs: enable direct I/O read support. Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index a35eb36..5cbe798 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -7,4 +7,4 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \ extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \ export.o tree-log.o acl.o free-space-cache.o zlib.o \ - compression.o delayed-ref.o relocation.o + compression.o delayed-ref.o relocation.o dio.o diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index fbc5bd1..09a4d8e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4935,12 +4935,9 @@ out: return em; } -static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, +extern ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, - unsigned long nr_segs) -{ - return -EINVAL; -} + unsigned long nr_segs); static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, __u64 start, __u64 len)