From patchwork Tue Jan 31 22:53:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9548753 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 ECC7960425 for ; Tue, 31 Jan 2017 22:54:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E37932832B for ; Tue, 31 Jan 2017 22:54:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8612283EC; Tue, 31 Jan 2017 22:54:09 +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 9A4A92832B for ; Tue, 31 Jan 2017 22:54:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750796AbdAaWyJ (ORCPT ); Tue, 31 Jan 2017 17:54:09 -0500 Received: from mail-pf0-f176.google.com ([209.85.192.176]:36502 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750828AbdAaWyI (ORCPT ); Tue, 31 Jan 2017 17:54:08 -0500 Received: by mail-pf0-f176.google.com with SMTP id 189so112770027pfu.3 for ; Tue, 31 Jan 2017 14:54:08 -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=a527iIQnTwtLUPZOSA+M9Makzy099qdktQkGfBMe/JM=; b=Vqijzm0e8j8MJr6B+AIFmMPaBoGMdwxLPTke6S3SKDOYh/9e/8j/4rjIAC9UqMIy7X WI482IqQlLULwy0MGdWErUKgsdohr+ufSOd2UWxTroCLEJo2jrWnSnjSXtZMZx//Db2O lofFV5wNlKfF+9pJie9peeWL/2H7hQN3KaDOEv1STBr5e4JNy+j9J935aD8SFj1vFCmR Mf/v9vdCJTRa8zdaWUpJbw27WQY8JX0aYGzhhjx6fGhTaN0R/WR91GLA4o8RvsKwFQM2 LeatcZPjLyEhLSAuHbQM6Si+DoTI16Sq9nMNos5N9iSPWZZAMs1/6wew+8NE1DFHxPeG aBrA== 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=a527iIQnTwtLUPZOSA+M9Makzy099qdktQkGfBMe/JM=; b=jsXwhtnW18TNa1x9BFC2iqWMHSeJapBwWFAHP6CZqAclvwnt1efRKqQoO/PtW7BwVs aoOtRBdKXNbHMNGurMWspuoKNs8aEPxntlSOKF5UgVuQ8Hewa4y+4eEC+ZFq3yLasD3Z Yk9zkxHjglLg3bkkW/SFFUtCsoVNWGD3mkJFwTa2eMrIeHVD2XxpuoevGUC95JvyKJET GD9mAlrV7SLZeqcWZ88XUFeaHbthAc9zWbCyaZtX6eiyZObho0otNUtouSwwJ/q9XiDd qeh98z8uk4KiSjttnGoIHs/RIlG2Sz0lRxtbmN8GC+JEFdlel4IFHlMCxGGvndIPYIh4 lYKw== X-Gm-Message-State: AIkVDXJ83q8JhW3jgG0udDauJWlnZvZrr9aIRlpSIJPGOdG1KO2S59gkLd+VM0paAO2X8892 X-Received: by 10.98.200.207 with SMTP id i76mr31384302pfk.38.1485903247801; Tue, 31 Jan 2017 14:54:07 -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:07 -0800 (PST) From: Omar Sandoval To: Jens Axboe , linux-block@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 2/6] block: fix debugfs config conditional in struct request_queue Date: Tue, 31 Jan 2017 14:53:18 -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 The debugfs dentries are only used for CONFIG_BLK_DEBUG_FS, so make them conditional on that instead of CONFIG_DEBUG_FS. Signed-off-by: Omar Sandoval --- include/linux/blkdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 05675b1dfd20..0cd0066a3d48 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -571,7 +571,7 @@ struct request_queue { struct list_head tag_set_list; struct bio_set *bio_split; -#ifdef CONFIG_DEBUG_FS +#ifdef CONFIG_BLK_DEBUG_FS struct dentry *debugfs_dir; struct dentry *mq_debugfs_dir; #endif