lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceph: build cleanly without CONFIG_DEBUG_FS

Browse Source 
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil
2009-11-12 15:05:52 -08:00
parent fef320ff88
commit 039934b895
5 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/ceph/debugfs.c
View File

@@ -8,6 +8,8 @@
#include "super.h" #include "super.h"
#include "mds_client.h" #include "mds_client.h"
#ifdef CONFIG_DEBUG_FS
/* /*
* Implement /sys/kernel/debug/ceph fun * Implement /sys/kernel/debug/ceph fun
* *
@@ -423,3 +425,24 @@ void ceph_debugfs_client_cleanup(struct ceph_client *client)
debugfs_remove(client->debugfs_dir); debugfs_remove(client->debugfs_dir);
} }
#else // CONFIG_DEBUG_FS
int __init ceph_debugfs_init(void)
{
return 0;
}
void ceph_debugfs_cleanup(void)
{
}
int ceph_debugfs_client_init(struct ceph_client *client)
{
return 0;
}
void ceph_debugfs_client_cleanup(struct ceph_client *client)
{
}
#endif // CONFIG_DEBUG_FS

2
fs/ceph/mds_client.h
View File

@@ -256,7 +256,9 @@ struct ceph_mds_client {
spinlock_t cap_dirty_lock; /* protects above items */ spinlock_t cap_dirty_lock; /* protects above items */
wait_queue_head_t cap_flushing_wq; wait_queue_head_t cap_flushing_wq;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_file; struct dentry *debugfs_file;
#endif
spinlock_t dentry_lru_lock; spinlock_t dentry_lru_lock;
struct list_head dentry_lru; struct list_head dentry_lru;

2
fs/ceph/mon_client.h
View File

@@ -78,7 +78,9 @@ struct ceph_mon_client {
int want_next_osdmap; /* 1 = want, 2 = want+asked */ int want_next_osdmap; /* 1 = want, 2 = want+asked */
u32 have_osdmap, have_mdsmap; u32 have_osdmap, have_mdsmap;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_file; struct dentry *debugfs_file;
#endif
}; };
extern struct ceph_monmap *ceph_monmap_decode(void *p, void *end); extern struct ceph_monmap *ceph_monmap_decode(void *p, void *end);

2
fs/ceph/osd_client.h
View File

@@ -83,7 +83,9 @@ struct ceph_osd_client {
struct rb_root requests; /* pending requests */ struct rb_root requests; /* pending requests */
int num_requests; int num_requests;
struct delayed_work timeout_work; struct delayed_work timeout_work;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_file; struct dentry *debugfs_file;
#endif
mempool_t *req_mempool; mempool_t *req_mempool;

2
fs/ceph/super.h
View File

@@ -112,9 +112,11 @@ static inline unsigned long time_sub(unsigned long a, unsigned long b)
*/ */
struct ceph_client { struct ceph_client {
__s64 whoami; /* my client number */ __s64 whoami; /* my client number */
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_monmap; struct dentry *debugfs_monmap;
struct dentry *debugfs_mdsmap, *debugfs_osdmap; struct dentry *debugfs_mdsmap, *debugfs_osdmap;
struct dentry *debugfs_dir, *debugfs_dentry_lru, *debugfs_caps; struct dentry *debugfs_dir, *debugfs_dentry_lru, *debugfs_caps;
#endif
struct mutex mount_mutex; /* serialize mount attempts */ struct mutex mount_mutex; /* serialize mount attempts */
struct ceph_mount_args *mount_args; struct ceph_mount_args *mount_args;