diff options
author | Sunil Mushran <sunil.mushran@oracle.com> | 2008-12-16 18:49:18 -0500 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2009-04-03 14:39:15 -0400 |
commit | 59b526a30722f29e5dba6210a6e0fc34e3149b94 (patch) | |
tree | d373fe3f283f584f22ffb7eed60c937c0bf893a6 /fs | |
parent | 50397507e856455b3f5cb3d5c7c482209f9e46a0 (diff) |
ocfs2: Remove debugfs file local_alloc_stats
This patch removes the debugfs file local_alloc_stats as that information
is now included in the fs_state debugfs file.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ocfs2/localalloc.c | 86 | ||||
-rw-r--r-- | fs/ocfs2/ocfs2.h | 5 |
2 files changed, 0 insertions, 91 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index ec70cdbe77fc..bac7e6abaf47 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/highmem.h> | 29 | #include <linux/highmem.h> |
30 | #include <linux/bitops.h> | 30 | #include <linux/bitops.h> |
31 | #include <linux/debugfs.h> | ||
32 | 31 | ||
33 | #define MLOG_MASK_PREFIX ML_DISK_ALLOC | 32 | #define MLOG_MASK_PREFIX ML_DISK_ALLOC |
34 | #include <cluster/masklog.h> | 33 | #include <cluster/masklog.h> |
@@ -75,84 +74,6 @@ static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, | |||
75 | static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, | 74 | static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, |
76 | struct inode *local_alloc_inode); | 75 | struct inode *local_alloc_inode); |
77 | 76 | ||
78 | #ifdef CONFIG_OCFS2_FS_STATS | ||
79 | |||
80 | static int ocfs2_la_debug_open(struct inode *inode, struct file *file) | ||
81 | { | ||
82 | file->private_data = inode->i_private; | ||
83 | return 0; | ||
84 | } | ||
85 | |||
86 | #define LA_DEBUG_BUF_SZ PAGE_CACHE_SIZE | ||
87 | #define LA_DEBUG_VER 1 | ||
88 | static ssize_t ocfs2_la_debug_read(struct file *file, char __user *userbuf, | ||
89 | size_t count, loff_t *ppos) | ||
90 | { | ||
91 | static DEFINE_MUTEX(la_debug_mutex); | ||
92 | struct ocfs2_super *osb = file->private_data; | ||
93 | int written, ret; | ||
94 | char *buf = osb->local_alloc_debug_buf; | ||
95 | |||
96 | mutex_lock(&la_debug_mutex); | ||
97 | memset(buf, 0, LA_DEBUG_BUF_SZ); | ||
98 | |||
99 | written = snprintf(buf, LA_DEBUG_BUF_SZ, | ||
100 | "0x%x\t0x%llx\t%u\t%u\t0x%x\n", | ||
101 | LA_DEBUG_VER, | ||
102 | (unsigned long long)osb->la_last_gd, | ||
103 | osb->local_alloc_default_bits, | ||
104 | osb->local_alloc_bits, osb->local_alloc_state); | ||
105 | |||
106 | ret = simple_read_from_buffer(userbuf, count, ppos, buf, written); | ||
107 | |||
108 | mutex_unlock(&la_debug_mutex); | ||
109 | return ret; | ||
110 | } | ||
111 | |||
112 | static const struct file_operations ocfs2_la_debug_fops = { | ||
113 | .open = ocfs2_la_debug_open, | ||
114 | .read = ocfs2_la_debug_read, | ||
115 | }; | ||
116 | |||
117 | static void ocfs2_init_la_debug(struct ocfs2_super *osb) | ||
118 | { | ||
119 | osb->local_alloc_debug_buf = kmalloc(LA_DEBUG_BUF_SZ, GFP_NOFS); | ||
120 | if (!osb->local_alloc_debug_buf) | ||
121 | return; | ||
122 | |||
123 | osb->local_alloc_debug = debugfs_create_file("local_alloc_stats", | ||
124 | S_IFREG|S_IRUSR, | ||
125 | osb->osb_debug_root, | ||
126 | osb, | ||
127 | &ocfs2_la_debug_fops); | ||
128 | if (!osb->local_alloc_debug) { | ||
129 | kfree(osb->local_alloc_debug_buf); | ||
130 | osb->local_alloc_debug_buf = NULL; | ||
131 | } | ||
132 | } | ||
133 | |||
134 | static void ocfs2_shutdown_la_debug(struct ocfs2_super *osb) | ||
135 | { | ||
136 | if (osb->local_alloc_debug) | ||
137 | debugfs_remove(osb->local_alloc_debug); | ||
138 | |||
139 | if (osb->local_alloc_debug_buf) | ||
140 | kfree(osb->local_alloc_debug_buf); | ||
141 | |||
142 | osb->local_alloc_debug_buf = NULL; | ||
143 | osb->local_alloc_debug = NULL; | ||
144 | } | ||
145 | #else /* CONFIG_OCFS2_FS_STATS */ | ||
146 | static void ocfs2_init_la_debug(struct ocfs2_super *osb) | ||
147 | { | ||
148 | return; | ||
149 | } | ||
150 | static void ocfs2_shutdown_la_debug(struct ocfs2_super *osb) | ||
151 | { | ||
152 | return; | ||
153 | } | ||
154 | #endif | ||
155 | |||
156 | static inline int ocfs2_la_state_enabled(struct ocfs2_super *osb) | 77 | static inline int ocfs2_la_state_enabled(struct ocfs2_super *osb) |
157 | { | 78 | { |
158 | return (osb->local_alloc_state == OCFS2_LA_THROTTLED || | 79 | return (osb->local_alloc_state == OCFS2_LA_THROTTLED || |
@@ -226,8 +147,6 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb) | |||
226 | 147 | ||
227 | mlog_entry_void(); | 148 | mlog_entry_void(); |
228 | 149 | ||
229 | ocfs2_init_la_debug(osb); | ||
230 | |||
231 | if (osb->local_alloc_bits == 0) | 150 | if (osb->local_alloc_bits == 0) |
232 | goto bail; | 151 | goto bail; |
233 | 152 | ||
@@ -299,9 +218,6 @@ bail: | |||
299 | if (inode) | 218 | if (inode) |
300 | iput(inode); | 219 | iput(inode); |
301 | 220 | ||
302 | if (status < 0) | ||
303 | ocfs2_shutdown_la_debug(osb); | ||
304 | |||
305 | mlog(0, "Local alloc window bits = %d\n", osb->local_alloc_bits); | 221 | mlog(0, "Local alloc window bits = %d\n", osb->local_alloc_bits); |
306 | 222 | ||
307 | mlog_exit(status); | 223 | mlog_exit(status); |
@@ -331,8 +247,6 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) | |||
331 | cancel_delayed_work(&osb->la_enable_wq); | 247 | cancel_delayed_work(&osb->la_enable_wq); |
332 | flush_workqueue(ocfs2_wq); | 248 | flush_workqueue(ocfs2_wq); |
333 | 249 | ||
334 | ocfs2_shutdown_la_debug(osb); | ||
335 | |||
336 | if (osb->local_alloc_state == OCFS2_LA_UNUSED) | 250 | if (osb->local_alloc_state == OCFS2_LA_UNUSED) |
337 | goto out; | 251 | goto out; |
338 | 252 | ||
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index 18d8542a615e..a7c8369c402f 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
@@ -287,11 +287,6 @@ struct ocfs2_super | |||
287 | 287 | ||
288 | u64 la_last_gd; | 288 | u64 la_last_gd; |
289 | 289 | ||
290 | #ifdef CONFIG_OCFS2_FS_STATS | ||
291 | struct dentry *local_alloc_debug; | ||
292 | char *local_alloc_debug_buf; | ||
293 | #endif | ||
294 | |||
295 | /* Next three fields are for local node slot recovery during | 290 | /* Next three fields are for local node slot recovery during |
296 | * mount. */ | 291 | * mount. */ |
297 | int dirty; | 292 | int dirty; |