From patchwork Thu Nov 13 21:22:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter Smith X-Patchwork-Id: 5301401 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9056DC11AC for ; Thu, 13 Nov 2014 21:44:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3F1C20219 for ; Thu, 13 Nov 2014 21:44:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CF3520211 for ; Thu, 13 Nov 2014 21:44:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934416AbaKMVoc (ORCPT ); Thu, 13 Nov 2014 16:44:32 -0500 Received: from mail-wg0-f54.google.com ([74.125.82.54]:35854 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934141AbaKMV3a (ORCPT ); Thu, 13 Nov 2014 16:29:30 -0500 Received: by mail-wg0-f54.google.com with SMTP id n12so17765404wgh.13 for ; Thu, 13 Nov 2014 13:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=dh+oftA+q4u++iJSLl7U7z3YrBMsvAM/gKxVHe4ZTpM=; b=emApQdqY/SwUmKIyucfMoIYl8uDpbBd/UTYzjvxnUo5Ou7ncP82FEhQ9tvgwqxRDbf BowOBi/cdSfx+dtUopAnTAAcvgA0umc2aMd2ZrJC1Ux5+0rh4WS1OWGmaHJ1gymIep81 f8EJXoPYElW7d7JWCMpPGYwoh6q43xPBPdx/8n4/IK/IGGkkwleXRZGoD0difoAbpHIf OEo+HlFOwnlFbSz6N7M6t75Aw4RYvFMKqNy6jEWc11SuvB/rpZ7lbC+oBrLadDmYKARG WUkWPvJOQAGraBMUQBtpauQU1iqBJWc8sEQ41KWJsbawEUPM+bmfc3ar7TiLF9YnZFSp A3XQ== X-Received: by 10.180.73.101 with SMTP id k5mr543335wiv.31.1415914169077; Thu, 13 Nov 2014 13:29:29 -0800 (PST) Received: from localhost.localdomain (ip4da2e5c1.direct-adsl.nl. [77.162.229.193]) by mx.google.com with ESMTPSA id i3sm865525wix.0.2014.11.13.13.29.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Nov 2014 13:29:28 -0800 (PST) From: Pieter Smith To: pieter@boesman.nl Cc: Josh Triplett , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org (open list:BTRFS FILE SYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 12/56] fs/btrfs: support compiling out splice Date: Thu, 13 Nov 2014 22:22:49 +0100 Message-Id: <1415913813-362-13-git-send-email-pieter@boesman.nl> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415913813-362-1-git-send-email-pieter@boesman.nl> References: <1415913813-362-1-git-send-email-pieter@boesman.nl> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Compile out splice support from btrfs when the splice-family of syscalls is not supported by the system (i.e. CONFIG_SYSCALL_SPLICE is undefined). Signed-off-by: Pieter Smith --- fs/btrfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index d3afac2..68c2f0a 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2704,7 +2704,7 @@ const struct file_operations btrfs_file_operations = { .read = new_sync_read, .write = new_sync_write, .read_iter = generic_file_read_iter, - .splice_read = generic_file_splice_read, + SPLICE_READ_INIT(generic_file_splice_read) .write_iter = btrfs_file_write_iter, .mmap = btrfs_file_mmap, .open = generic_file_open,