orangefs: remove ORANGEFS_KERNEL_DEBUG

Web:        https://git.kernel.org/torvalds/c/538e30482155dbaaa53495ed37b889e9c2577cb9
Commit:     538e30482155dbaaa53495ed37b889e9c2577cb9
Parent:     79d7cd611d9e0ee9b4c38bd33f6082979826885f
Refname:    refs/heads/master
Author:     Martin Brandenburg <[email protected]>
AuthorDate: Fri Jan 26 14:07:13 2018 -0500
Committer:  Mike Marshall <[email protected]>
CommitDate: Tue Feb 6 16:38:12 2018 -0500

    orangefs: remove ORANGEFS_KERNEL_DEBUG
    
    It wasn't possible to enable it, and it would've had very little effect.
    
    Signed-off-by: Martin Brandenburg <[email protected]>
    Signed-off-by: Mike Marshall <[email protected]>
---
 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[];
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html