From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752775AbeAZTJQ (ORCPT ); Fri, 26 Jan 2018 14:09:16 -0500 Received: from mail-yw0-f194.google.com ([209.85.161.194]:36189 "EHLO mail-yw0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752830AbeAZTHq (ORCPT ); Fri, 26 Jan 2018 14:07:46 -0500 X-Google-Smtp-Source: AH8x224qXNjCf/GQwlPW1lRhd/2tNluqpNOa/2za1PPF838H5FpD6sWa0SRdLccMbdcqpw8P45AHAw== From: Martin Brandenburg To: hubcap@omnibond.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, devel@lists.orangefs.org Cc: Martin Brandenburg Subject: [PATCH 3/7] orangefs: remove ORANGEFS_KERNEL_DEBUG Date: Fri, 26 Jan 2018 14:07:13 -0500 Message-Id: <20180126190717.11075-4-martin@omnibond.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180126190717.11075-1-martin@omnibond.com> References: <20180126190717.11075-1-martin@omnibond.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It wasn't possible to enable it, and it would've had very little effect. Signed-off-by: Martin Brandenburg --- fs/orangefs/orangefs-kernel.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h index 2595453fe737..25bacc334d91 100644 --- a/fs/orangefs/orangefs-kernel.h +++ b/fs/orangefs/orangefs-kernel.h @@ -56,11 +56,7 @@ #include "orangefs-dev-proto.h" -#ifdef ORANGEFS_KERNEL_DEBUG -#define ORANGEFS_DEFAULT_OP_TIMEOUT_SECS 10 -#else #define ORANGEFS_DEFAULT_OP_TIMEOUT_SECS 20 -#endif #define ORANGEFS_BUFMAP_WAIT_TIMEOUT_SECS 30 @@ -104,11 +100,11 @@ enum orangefs_vfs_op_states { * orangefs kernel memory related flags */ -#if ((defined ORANGEFS_KERNEL_DEBUG) && (defined CONFIG_DEBUG_SLAB)) +#if (defined CONFIG_DEBUG_SLAB) #define ORANGEFS_CACHE_CREATE_FLAGS SLAB_RED_ZONE #else #define ORANGEFS_CACHE_CREATE_FLAGS 0 -#endif /* ((defined ORANGEFS_KERNEL_DEBUG) && (defined CONFIG_DEBUG_SLAB)) */ +#endif extern int orangefs_init_acl(struct inode *inode, struct inode *dir); extern const struct xattr_handler *orangefs_xattr_handlers[]; -- 2.14.2