Commit a53f4f9efaeb1d87cfae066346979d4d70e1abe9
Committed by
Linus Torvalds
1 parent
88be12c440
Exists in
master
and in
39 other branches
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: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 4 changed files with 10 additions and 10 deletions Side-by-side Diff
fs/fscache/object.c
... | ... | @@ -53,7 +53,7 @@ |
53 | 53 | static void fscache_object_slow_work_put_ref(struct slow_work *); |
54 | 54 | static int fscache_object_slow_work_get_ref(struct slow_work *); |
55 | 55 | static void fscache_object_slow_work_execute(struct slow_work *); |
56 | -#ifdef CONFIG_SLOW_WORK_PROC | |
56 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
57 | 57 | static void fscache_object_slow_work_desc(struct slow_work *, struct seq_file *); |
58 | 58 | #endif |
59 | 59 | static void fscache_initialise_object(struct fscache_object *); |
... | ... | @@ -69,7 +69,7 @@ |
69 | 69 | .get_ref = fscache_object_slow_work_get_ref, |
70 | 70 | .put_ref = fscache_object_slow_work_put_ref, |
71 | 71 | .execute = fscache_object_slow_work_execute, |
72 | -#ifdef CONFIG_SLOW_WORK_PROC | |
72 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
73 | 73 | .desc = fscache_object_slow_work_desc, |
74 | 74 | #endif |
75 | 75 | }; |
... | ... | @@ -364,7 +364,7 @@ |
364 | 364 | /* |
365 | 365 | * describe an object for slow-work debugging |
366 | 366 | */ |
367 | -#ifdef CONFIG_SLOW_WORK_PROC | |
367 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
368 | 368 | static void fscache_object_slow_work_desc(struct slow_work *work, |
369 | 369 | struct seq_file *m) |
370 | 370 | { |
fs/fscache/operation.c
... | ... | @@ -500,7 +500,7 @@ |
500 | 500 | /* |
501 | 501 | * describe an operation for slow-work debugging |
502 | 502 | */ |
503 | -#ifdef CONFIG_SLOW_WORK_PROC | |
503 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
504 | 504 | static void fscache_op_desc(struct slow_work *work, struct seq_file *m) |
505 | 505 | { |
506 | 506 | struct fscache_operation *op = |
... | ... | @@ -517,7 +517,7 @@ |
517 | 517 | .get_ref = fscache_op_get_ref, |
518 | 518 | .put_ref = fscache_op_put_ref, |
519 | 519 | .execute = fscache_op_execute, |
520 | -#ifdef CONFIG_SLOW_WORK_PROC | |
520 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
521 | 521 | .desc = fscache_op_desc, |
522 | 522 | #endif |
523 | 523 | }; |
include/linux/fscache-cache.h
... | ... | @@ -105,7 +105,7 @@ |
105 | 105 | /* operation releaser */ |
106 | 106 | fscache_operation_release_t release; |
107 | 107 | |
108 | -#ifdef CONFIG_SLOW_WORK_PROC | |
108 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
109 | 109 | const char *name; /* operation name */ |
110 | 110 | const char *state; /* operation state */ |
111 | 111 | #define fscache_set_op_name(OP, N) do { (OP)->name = (N); } while(0) |
kernel/slow-work.h
... | ... | @@ -43,28 +43,28 @@ |
43 | 43 | */ |
44 | 44 | static inline void slow_work_set_thread_pid(int id, pid_t pid) |
45 | 45 | { |
46 | -#ifdef CONFIG_SLOW_WORK_PROC | |
46 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
47 | 47 | slow_work_pids[id] = pid; |
48 | 48 | #endif |
49 | 49 | } |
50 | 50 | |
51 | 51 | static inline void slow_work_mark_time(struct slow_work *work) |
52 | 52 | { |
53 | -#ifdef CONFIG_SLOW_WORK_PROC | |
53 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
54 | 54 | work->mark = CURRENT_TIME; |
55 | 55 | #endif |
56 | 56 | } |
57 | 57 | |
58 | 58 | static inline void slow_work_begin_exec(int id, struct slow_work *work) |
59 | 59 | { |
60 | -#ifdef CONFIG_SLOW_WORK_PROC | |
60 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
61 | 61 | slow_work_execs[id] = work; |
62 | 62 | #endif |
63 | 63 | } |
64 | 64 | |
65 | 65 | static inline void slow_work_end_exec(int id, struct slow_work *work) |
66 | 66 | { |
67 | -#ifdef CONFIG_SLOW_WORK_PROC | |
67 | +#ifdef CONFIG_SLOW_WORK_DEBUG | |
68 | 68 | write_lock(&slow_work_execs_lock); |
69 | 69 | slow_work_execs[id] = NULL; |
70 | 70 | write_unlock(&slow_work_execs_lock); |