From patchwork Thu Nov 13 21:22:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter Smith X-Patchwork-Id: 5301351 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 118B89F2ED for ; Thu, 13 Nov 2014 21:43:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F872201FA for ; Thu, 13 Nov 2014 21:43:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D9AF201F4 for ; Thu, 13 Nov 2014 21:43:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964929AbaKMVnj (ORCPT ); Thu, 13 Nov 2014 16:43:39 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:41009 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933418AbaKMV3d (ORCPT ); Thu, 13 Nov 2014 16:29:33 -0500 Received: by mail-wi0-f179.google.com with SMTP id ex7so933811wid.0 for ; Thu, 13 Nov 2014 13:29:32 -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=FGVcO6ClBgaEEp2myL3VKJL15OfSkzp7tt1V9skOJE0=; b=zZAfirEf6+r/03lzPN20cQIme5p1f+oq/wIiD1DjB5yaRuTvQjOzBvsu9INL6YQsfu Rc/2GSzjPOzFdF5rU8hwkAPzNFzTBoyketzy4TNsC47n/vqzG02IuavUprRWaydbqUum XeNYsX/GFPVqrVSbjiDMjo0Y0oUI1OYH8Eea41WDYpDXQCqwCGZmpAShW8i6GQS5AdvQ hzSi2P5fv/8aMrf1xcljHVPgsrFQ7qvaHO3647b9HqCL7Gu8SGKzrcakpAr0pFyrBF3g 2UsCv8O7hsqUVH1bN5ecFONkejeN566xxnPGYsp3Nhu7EH/37lUVnNFNKKiRdW5cmFcw G10g== X-Received: by 10.180.188.69 with SMTP id fy5mr1746047wic.57.1415914172005; Thu, 13 Nov 2014 13:29:32 -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.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Nov 2014 13:29:31 -0800 (PST) From: Pieter Smith To: pieter@boesman.nl Cc: Josh Triplett , Steve French , linux-cifs@vger.kernel.org (open list:COMMON INTERNET F...), samba-technical@lists.samba.org (moderated list:COMMON INTERNET F...), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 14/56] fs/cifs: support compiling out splice Date: Thu, 13 Nov 2014 22:22:51 +0100 Message-Id: <1415913813-362-15-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-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@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=unavailable 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 cifs 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/cifs/cifsfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ac4f260..b2bd0a0 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -902,7 +902,7 @@ const struct file_operations cifs_file_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, + SPLICE_READ_INIT(generic_file_splice_read) .llseek = cifs_llseek, #ifdef CONFIG_CIFS_POSIX .unlocked_ioctl = cifs_ioctl, @@ -921,7 +921,7 @@ const struct file_operations cifs_file_strict_ops = { .fsync = cifs_strict_fsync, .flush = cifs_flush, .mmap = cifs_file_strict_mmap, - .splice_read = generic_file_splice_read, + SPLICE_READ_INIT(generic_file_splice_read) .llseek = cifs_llseek, #ifdef CONFIG_CIFS_POSIX .unlocked_ioctl = cifs_ioctl, @@ -941,7 +941,7 @@ const struct file_operations cifs_file_direct_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, + SPLICE_READ_INIT(generic_file_splice_read) #ifdef CONFIG_CIFS_POSIX .unlocked_ioctl = cifs_ioctl, #endif /* CONFIG_CIFS_POSIX */ @@ -959,7 +959,7 @@ const struct file_operations cifs_file_nobrl_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, + SPLICE_READ_INIT(generic_file_splice_read) .llseek = cifs_llseek, #ifdef CONFIG_CIFS_POSIX .unlocked_ioctl = cifs_ioctl, @@ -977,7 +977,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = { .fsync = cifs_strict_fsync, .flush = cifs_flush, .mmap = cifs_file_strict_mmap, - .splice_read = generic_file_splice_read, + SPLICE_READ_INIT(generic_file_splice_read) .llseek = cifs_llseek, #ifdef CONFIG_CIFS_POSIX .unlocked_ioctl = cifs_ioctl, @@ -996,7 +996,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { .fsync = cifs_fsync, .flush = cifs_flush, .mmap = cifs_file_mmap, - .splice_read = generic_file_splice_read, + SPLICE_READ_INIT(generic_file_splice_read) #ifdef CONFIG_CIFS_POSIX .unlocked_ioctl = cifs_ioctl, #endif /* CONFIG_CIFS_POSIX */