diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 14:50:46 -0400 |
|---|---|---|
| committer | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 14:50:46 -0400 |
| commit | b78b11985a36bfe768add17ffb70bbaf9d8d7627 (patch) | |
| tree | 20915bb2586b22567d408c753bba346f131fa759 /fs/orangefs/protocol.h | |
| parent | f808e138c0abd99bfce90ec8d4ef6406c2af714a (diff) | |
| parent | 1d503617884ed43af1c03685e73ce23f155d3fa4 (diff) | |
| download | kernel_replicant_linux-b78b11985a36bfe768add17ffb70bbaf9d8d7627.tar.gz kernel_replicant_linux-b78b11985a36bfe768add17ffb70bbaf9d8d7627.tar.bz2 kernel_replicant_linux-b78b11985a36bfe768add17ffb70bbaf9d8d7627.zip | |
Merge branch 'misc' into for-next
Pull in an OrangeFS branch containing miscellaneous improvements.
- clean up debugfs globals
- remove dead code in sysfs
- reorganize duplicated sysfs attribute structs
- consolidate sysfs show and store functions
- remove duplicated sysfs_ops structures
- describe organization of sysfs
- make devreq_mutex static
- g_orangefs_stats -> orangefs_stats for consistency
- rename most remaining global variables
Diffstat (limited to 'fs/orangefs/protocol.h')
| -rw-r--r-- | fs/orangefs/protocol.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h index 3d7418c728f5..971307ad69be 100644 --- a/fs/orangefs/protocol.h +++ b/fs/orangefs/protocol.h @@ -4,26 +4,6 @@ #include <linux/slab.h> #include <linux/ioctl.h> -extern struct client_debug_mask *cdm_array; -extern char *debug_help_string; -extern int help_string_initialized; -extern struct dentry *debug_dir; -extern struct dentry *help_file_dentry; -extern struct dentry *client_debug_dentry; -extern const struct file_operations debug_help_fops; -extern int client_all_index; -extern int client_verbose_index; -extern int cdm_element_count; -#define DEBUG_HELP_STRING_SIZE 4096 -#define HELP_STRING_UNINITIALIZED \ - "Client Debug Keywords are unknown until the first time\n" \ - "the client is started after boot.\n" -#define ORANGEFS_KMOD_DEBUG_HELP_FILE "debug-help" -#define ORANGEFS_KMOD_DEBUG_FILE "kernel-debug" -#define ORANGEFS_CLIENT_DEBUG_FILE "client-debug" -#define ORANGEFS_VERBOSE "verbose" -#define ORANGEFS_ALL "all" - /* pvfs2-config.h ***********************************************************/ #define ORANGEFS_VERSION_MAJOR 2 #define ORANGEFS_VERSION_MINOR 9 @@ -426,13 +406,12 @@ do { \ printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ } while (0) #else -extern __u64 gossip_debug_mask; -extern struct client_debug_mask client_debug_mask; +extern __u64 orangefs_gossip_debug_mask; /* try to avoid function call overhead by checking masks in macro */ #define gossip_debug(mask, fmt, ...) \ do { \ - if (gossip_debug_mask & (mask)) \ + if (orangefs_gossip_debug_mask & (mask)) \ printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ } while (0) #endif /* GOSSIP_DISABLE_DEBUG */ |