From c71c40fa7985ec5ffe01e83b96284ff15fa3670b Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 5 May 2016 22:42:47 -0400 Subject: [PATCH] add patch remove-excess-descriptions-for-handle_s --- remove-excess-descriptions-for-handle_s | 42 +++++++++++++++++++++++++++++++++ series | 1 + timestamps | 7 +++--- 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 remove-excess-descriptions-for-handle_s diff --git a/remove-excess-descriptions-for-handle_s b/remove-excess-descriptions-for-handle_s new file mode 100644 index 00000000..0cb7b4d7 --- /dev/null +++ b/remove-excess-descriptions-for-handle_s @@ -0,0 +1,42 @@ +jbd2: remove excess descriptions for handle_s + +From: Luis de Bethencourt + +Commit bf6993276f74 ("jbd2: Use tracepoints for history file") +removed the members j_history, j_history_max and j_history_cur from struct +handle_s but the descriptions stayed lingering. Removing them. + +Signed-off-by: Luis de Bethencourt +Signed-off-by: Theodore Ts'o +Reviewed-by: Jan Kara +--- +Hi, + +Noticed this issue when running make htmldocs. + +It gives the following warnings: +.//include/linux/jbd2.h:1033: warning: Excess struct/union/enum/typedef member 'j_history' description in 'journal_s' +.//include/linux/jbd2.h:1033: warning: Excess struct/union/enum/typedef member 'j_history_max' description in 'journal_s' +.//include/linux/jbd2.h:1033: warning: Excess struct/union/enum/typedef member 'j_history_cur' description in 'journal_s' + +Thanks, +Luis + + include/linux/jbd2.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h +index fd1083c..401792d 100644 +--- a/include/linux/jbd2.h ++++ b/include/linux/jbd2.h +@@ -781,9 +781,6 @@ jbd2_time_diff(unsigned long start, unsigned long end) + * @j_wbufsize: maximum number of buffer_heads allowed in j_wbuf, the + * number that will fit in j_blocksize + * @j_last_sync_writer: most recent pid which did a synchronous write +- * @j_history: Buffer storing the transactions statistics history +- * @j_history_max: Maximum number of transactions in the statistics history +- * @j_history_cur: Current number of transactions in the statistics history + * @j_history_lock: Protect the transactions statistics history + * @j_proc_entry: procfs entry for the jbd statistics directory + * @j_stats: Overall statistics + diff --git a/series b/series index 0f0169bc..a4212543 100644 --- a/series +++ b/series @@ -23,6 +23,7 @@ silence-ubsan-in-mb_find_order_for_block silence-UBSAN-in-ext4_mb_init remove-unnecessary-bio-get-put +remove-excess-descriptions-for-handle_s ########################################## # unstable patches diff --git a/timestamps b/timestamps index 97f3392c..190aef9a 100755 --- a/timestamps +++ b/timestamps @@ -47,6 +47,7 @@ touch -d @1462484283 silence-ubsan-in-mb_find_order_for_block touch -d @1462491979 silence-UBSAN-in-ext4_mb_init touch -d @1462492039 stable-boundary touch -d @1462500589 remove-unnecessary-bio-get-put -touch -d @1462500606 series -touch -d @1462500610 status -touch -d @1462502094 timestamps +touch -d @1462502154 remove-excess-descriptions-for-handle_s +touch -d @1462502208 series +touch -d @1462502211 status +touch -d @1462502560 timestamps -- 2.11.4.GIT