Commit a53f4f9e authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

SLOW_WORK: CONFIG_SLOW_WORK_PROC should be CONFIG_SLOW_WORK_DEBUG



CONFIG_SLOW_WORK_PROC was changed to CONFIG_SLOW_WORK_DEBUG, but not in all
instances.  Change the remaining instances.  This makes the debugfs file
display the time mark and the owner's description again.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 88be12c4
...@@ -53,7 +53,7 @@ const char fscache_object_states_short[FSCACHE_OBJECT__NSTATES][5] = { ...@@ -53,7 +53,7 @@ const char fscache_object_states_short[FSCACHE_OBJECT__NSTATES][5] = {
static void fscache_object_slow_work_put_ref(struct slow_work *); static void fscache_object_slow_work_put_ref(struct slow_work *);
static int fscache_object_slow_work_get_ref(struct slow_work *); static int fscache_object_slow_work_get_ref(struct slow_work *);
static void fscache_object_slow_work_execute(struct slow_work *); static void fscache_object_slow_work_execute(struct slow_work *);
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
static void fscache_object_slow_work_desc(struct slow_work *, struct seq_file *); static void fscache_object_slow_work_desc(struct slow_work *, struct seq_file *);
#endif #endif
static void fscache_initialise_object(struct fscache_object *); static void fscache_initialise_object(struct fscache_object *);
...@@ -69,7 +69,7 @@ const struct slow_work_ops fscache_object_slow_work_ops = { ...@@ -69,7 +69,7 @@ const struct slow_work_ops fscache_object_slow_work_ops = {
.get_ref = fscache_object_slow_work_get_ref, .get_ref = fscache_object_slow_work_get_ref,
.put_ref = fscache_object_slow_work_put_ref, .put_ref = fscache_object_slow_work_put_ref,
.execute = fscache_object_slow_work_execute, .execute = fscache_object_slow_work_execute,
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
.desc = fscache_object_slow_work_desc, .desc = fscache_object_slow_work_desc,
#endif #endif
}; };
...@@ -364,7 +364,7 @@ static void fscache_object_slow_work_execute(struct slow_work *work) ...@@ -364,7 +364,7 @@ static void fscache_object_slow_work_execute(struct slow_work *work)
/* /*
* describe an object for slow-work debugging * describe an object for slow-work debugging
*/ */
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
static void fscache_object_slow_work_desc(struct slow_work *work, static void fscache_object_slow_work_desc(struct slow_work *work,
struct seq_file *m) struct seq_file *m)
{ {
......
...@@ -500,7 +500,7 @@ static void fscache_op_execute(struct slow_work *work) ...@@ -500,7 +500,7 @@ static void fscache_op_execute(struct slow_work *work)
/* /*
* describe an operation for slow-work debugging * describe an operation for slow-work debugging
*/ */
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
static void fscache_op_desc(struct slow_work *work, struct seq_file *m) static void fscache_op_desc(struct slow_work *work, struct seq_file *m)
{ {
struct fscache_operation *op = struct fscache_operation *op =
...@@ -517,7 +517,7 @@ const struct slow_work_ops fscache_op_slow_work_ops = { ...@@ -517,7 +517,7 @@ const struct slow_work_ops fscache_op_slow_work_ops = {
.get_ref = fscache_op_get_ref, .get_ref = fscache_op_get_ref,
.put_ref = fscache_op_put_ref, .put_ref = fscache_op_put_ref,
.execute = fscache_op_execute, .execute = fscache_op_execute,
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
.desc = fscache_op_desc, .desc = fscache_op_desc,
#endif #endif
}; };
...@@ -105,7 +105,7 @@ struct fscache_operation { ...@@ -105,7 +105,7 @@ struct fscache_operation {
/* operation releaser */ /* operation releaser */
fscache_operation_release_t release; fscache_operation_release_t release;
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
const char *name; /* operation name */ const char *name; /* operation name */
const char *state; /* operation state */ const char *state; /* operation state */
#define fscache_set_op_name(OP, N) do { (OP)->name = (N); } while(0) #define fscache_set_op_name(OP, N) do { (OP)->name = (N); } while(0)
......
...@@ -43,28 +43,28 @@ extern void slow_work_new_thread_desc(struct slow_work *, struct seq_file *); ...@@ -43,28 +43,28 @@ extern void slow_work_new_thread_desc(struct slow_work *, struct seq_file *);
*/ */
static inline void slow_work_set_thread_pid(int id, pid_t pid) static inline void slow_work_set_thread_pid(int id, pid_t pid)
{ {
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
slow_work_pids[id] = pid; slow_work_pids[id] = pid;
#endif #endif
} }
static inline void slow_work_mark_time(struct slow_work *work) static inline void slow_work_mark_time(struct slow_work *work)
{ {
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
work->mark = CURRENT_TIME; work->mark = CURRENT_TIME;
#endif #endif
} }
static inline void slow_work_begin_exec(int id, struct slow_work *work) static inline void slow_work_begin_exec(int id, struct slow_work *work)
{ {
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
slow_work_execs[id] = work; slow_work_execs[id] = work;
#endif #endif
} }
static inline void slow_work_end_exec(int id, struct slow_work *work) static inline void slow_work_end_exec(int id, struct slow_work *work)
{ {
#ifdef CONFIG_SLOW_WORK_PROC #ifdef CONFIG_SLOW_WORK_DEBUG
write_lock(&slow_work_execs_lock); write_lock(&slow_work_execs_lock);
slow_work_execs[id] = NULL; slow_work_execs[id] = NULL;
write_unlock(&slow_work_execs_lock); write_unlock(&slow_work_execs_lock);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment