|
@@ -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[];
|