From patchwork Thu Nov 13 21:22:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter Smith X-Patchwork-Id: 5301381 Return-Path: X-Original-To: patchwork-ceph-devel@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 65EDDC11AC for ; Thu, 13 Nov 2014 21:44:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2B72201F4 for ; Thu, 13 Nov 2014 21:44:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFFE120211 for ; Thu, 13 Nov 2014 21:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965029AbaKMVn4 (ORCPT ); Thu, 13 Nov 2014 16:43:56 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:36296 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934504AbaKMV3c (ORCPT ); Thu, 13 Nov 2014 16:29:32 -0500 Received: by mail-wi0-f177.google.com with SMTP id l15so897648wiw.10 for ; Thu, 13 Nov 2014 13:29:30 -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=dZPVTYUXN4x4Td0laQR8vr+Jh2DQ4uIrDi7tRbAam7w=; b=MbjQPxNH+3TP6DMx4kGTRQK938lT7z/jLLXAGE0nRxTzqJPFhLSUmU27Zxwu1lLkT3 JW6Undj7aLPP1lvB7mpTytCaVXtn+B13/sbh2ne2HA8YjlipriQdn2zaNuM3gjWU0jg2 P+Z5Ui4TXLAUGa+wOmf8umhEiadGG5ABkzhtywICI9Pw0CPi/9ar1blw1C5DMOJYob6/ 83P5Q9niyT7sKXXBtk6dsWjjHAIbgoC31p2H7nY2wbM0c6bVFN2S1Bv6tUgSmFfc5ZyS T3Aq9SvLZLbSsENp8TeMqCDe1TTQDhZAcVoOO4q0U0q9tQTl3EizUCq5QkbusdYl1Mn/ evpA== X-Received: by 10.180.13.226 with SMTP id k2mr1778124wic.25.1415914170526; Thu, 13 Nov 2014 13:29:30 -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.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Nov 2014 13:29:29 -0800 (PST) From: Pieter Smith To: pieter@boesman.nl Cc: Josh Triplett , Sage Weil , ceph-devel@vger.kernel.org (open list:CEPH DISTRIBUTED...), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 13/56] fs/ceph: support compiling out splice Date: Thu, 13 Nov 2014 22:22:50 +0100 Message-Id: <1415913813-362-14-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: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@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 ceph 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/ceph/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 2eb02f8..c85396a 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1251,8 +1251,8 @@ const struct file_operations ceph_file_fops = { .fsync = ceph_fsync, .lock = ceph_lock, .flock = ceph_flock, - .splice_read = generic_file_splice_read, - .splice_write = iter_file_splice_write, + SPLICE_READ_INIT(generic_file_splice_read) + SPLICE_WRITE_INIT(iter_file_splice_write) .unlocked_ioctl = ceph_ioctl, .compat_ioctl = ceph_ioctl, .fallocate = ceph_fallocate,