jbd/jbd2: relocate bit_spinlock header to jbd_common

The bit_spinlock functions are only used for the jbd_lock_bh_state functions (and friends) in jbd_common.h and are not directly used by either of jbd.h or jbd2.h content. The jbd_common file is new as of commit 446066724c36 ("jdb/jbd2: factor out common functions from the jbd[2] header files") but common (and isolated) headers were not considered for factoring at that time. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

jbd/jbd2: relocate bit_spinlock header to jbd_common
The bit_spinlock functions are only used for the jbd_lock_bh_state functions (and friends) in jbd_common.h and are not directly used by either of jbd.h or jbd2.h content. The jbd_common file is new as of commit 446066724c36 ("jdb/jbd2: factor out common functions from the jbd[2] header files") but common (and isolated) headers were not considered for factoring at that time. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Paul Gortmaker · Theodore Ts'o
1 parent cfc7bc896f
Showing 3 changed files with 2 additions and 2 deletions Side-by-side Diff
include/linux/jbd.h
include/linux/jbd2.h
include/linux/jbd_common.h
@@ -27,7 +27,6 @@
 #include <linux/buffer_head.h>
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
-#include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/lockdep.h>
@@ -26,7 +26,6 @@
 #include <linux/buffer_head.h>
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
-#include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
 #ifndef _LINUX_JBD_STATE_H
 #define _LINUX_JBD_STATE_H
  
+#include <linux/bit_spinlock.h>
+
 static inline struct buffer_head *jh2bh(struct journal_head *jh)
 {
 	return jh->b_bh;
...	...	@@ -27,7 +27,6 @@
27	27	#include <linux/buffer_head.h>
28	28	#include <linux/journal-head.h>
29	29	#include <linux/stddef.h>
30		-#include <linux/bit_spinlock.h>
31	30	#include <linux/mutex.h>
32	31	#include <linux/timer.h>
33	32	#include <linux/lockdep.h>
...	...	@@ -26,7 +26,6 @@
26	26	#include <linux/buffer_head.h>
27	27	#include <linux/journal-head.h>
28	28	#include <linux/stddef.h>
29		-#include <linux/bit_spinlock.h>
30	29	#include <linux/mutex.h>
31	30	#include <linux/timer.h>
32	31	#include <linux/slab.h>
1	1	#ifndef _LINUX_JBD_STATE_H
2	2	#define _LINUX_JBD_STATE_H
3	3
	4	+#include <linux/bit_spinlock.h>
	5	+
4	6	static inline struct buffer_head jh2bh(struct journal_head jh)
5	7	{
6	8	return jh->b_bh;