From patchwork Tue Jan 31 22:53:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9548761 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E43660236 for ; Tue, 31 Jan 2017 23:01:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 733792832B for ; Tue, 31 Jan 2017 23:01:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 660C5283EC; Tue, 31 Jan 2017 23:01:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E43AA2832B for ; Tue, 31 Jan 2017 23:01:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750830AbdAaXB4 (ORCPT ); Tue, 31 Jan 2017 18:01:56 -0500 Received: from mail-pf0-f172.google.com ([209.85.192.172]:34269 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750828AbdAaXBz (ORCPT ); Tue, 31 Jan 2017 18:01:55 -0500 Received: by mail-pf0-f172.google.com with SMTP id e4so112216318pfg.1 for ; Tue, 31 Jan 2017 15:01:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=kQgqw5TzW8or5iUIWqdDrhKomLEr1r2mXnFVAGg8038=; b=EVgn8ZwDdKr1RHlRk+j1inFkUJem25WA1l+Jx/i9c7lqf/umBVIA1IQDZ1ttKLHvy1 Q+MLFgMlvAh1o/Zf/T+XfLpcylC+4nh0n1TrpEqZ7MdRtlDffQptWyNnEmeySeCw8KLa fylmTBtZ6NNYFoIO/4r2WAieVpO5qlNix98g3PZdvTpFSrB/QtE9ya35AWuGXVNmghJn tdZatBn3PAg0FHVKwZtGpFScIYt2ErOMPYQvqfAqkVvnMZGki1j5NoLWI13pyuPAB2kr xqA8BPxOe3HF6g45gPjAz2IXVevDMhvP9t6EL1+dGYXfGD+l5TuL9bHTVezNQjVVPyvq e16Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=kQgqw5TzW8or5iUIWqdDrhKomLEr1r2mXnFVAGg8038=; b=kyd4oT7JThgyE+L8nFV8UCYwbSMZFPmOCZBTjZmVPqOa32RYK1IpSnVy/yMQJJ7xJo LBu3FjulCOgx13LG2f2cwQexUax5Q5JgyJYBzRNNci3LrRmux0sUz1QFxeFgi1N6UGa6 MByHgnk+uGSjY/9L7ZGcvoFBoB6RRaBKNHW7cZXaMEhrBtdIAOGpc1UmyvePEEll3VSX dgpJai6151TVJYw2/U7XhDEE47tD4YgvLiiPLUp59V3v4N9arLEDLdZqhszOqASJexNy DR06vp9f4dTO9t06EMf4kq7JYL+W0PP7UeHWGL0FcnYgTTnCMpEOfJ9UxuX5rS9lzuVk 92bQ== X-Gm-Message-State: AIkVDXIcublhlAmLlhxBwfEw8go2OdI6KzQIIbukeY+oceIhVKc0sBtbmIrBYRUAtzQey6Kc X-Received: by 10.98.65.148 with SMTP id g20mr32523913pfd.44.1485903248641; Tue, 31 Jan 2017 14:54:08 -0800 (PST) Received: from vader.thefacebook.com ([2620:10d:c090:200::b:7f05]) by smtp.gmail.com with ESMTPSA id e127sm43614618pfh.89.2017.01.31.14.54.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 14:54:08 -0800 (PST) From: Omar Sandoval To: Jens Axboe , linux-block@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 3/6] blktrace: make do_blk_trace_setup() static Date: Tue, 31 Jan 2017 14:53:19 -0800 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval This isn't used outside of blktrace.c anymore. Fixes: 62c2a7d969f3 ("block: push BKL into blktrace ioctls") Signed-off-by: Omar Sandoval --- include/linux/blktrace_api.h | 4 ---- kernel/trace/blktrace.c | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index e417f080219a..75458bc19a16 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -30,9 +30,6 @@ struct blk_trace { extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); extern void blk_trace_shutdown(struct request_queue *); -extern int do_blk_trace_setup(struct request_queue *q, char *name, - dev_t dev, struct block_device *bdev, - struct blk_user_trace_setup *buts); extern __printf(2, 3) void __trace_note_message(struct blk_trace *, const char *fmt, ...); @@ -80,7 +77,6 @@ extern struct attribute_group blk_trace_attr_group; #else /* !CONFIG_BLK_DEV_IO_TRACE */ # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) # define blk_trace_shutdown(q) do { } while (0) -# define do_blk_trace_setup(q, name, dev, bdev, buts) (-ENOTTY) # define blk_add_driver_data(q, rq, data, len) do {} while (0) # define blk_trace_setup(q, name, dev, bdev, arg) (-ENOTTY) # define blk_trace_startstop(q, start) (-ENOTTY) diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 95cecbf67f5c..83d3b5b58f53 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -433,9 +433,9 @@ static void blk_trace_setup_lba(struct blk_trace *bt, /* * Setup everything required to start tracing */ -int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, - struct block_device *bdev, - struct blk_user_trace_setup *buts) +static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, + struct block_device *bdev, + struct blk_user_trace_setup *buts) { struct blk_trace *bt = NULL; struct dentry *dir = NULL;