relocate-bit_spinlock-header-to-jbd_common

   1 jbd/jbd2: relocate bit_spinlock header to jbd_common
   2
   3 From: Paul Gortmaker <paul.gortmaker@windriver.com>
   4
   5 The bit_spinlock functions are only used for the jbd_lock_bh_state
   6 functions (and friends) in jbd_common.h and are not directly used
   7 by either of jbd.h or jbd2.h content.
   8
   9 The jbd_common file is new as of commit 446066724c36 ("jdb/jbd2: factor
  10 out common functions from the jbd[2] header files") but common
  11 (and isolated) headers were not considered for factoring at that time.
  12
  13 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
  14 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  15 ---
  16  include/linux/jbd.h        | 1 -
  17  include/linux/jbd2.h       | 1 -
  18  include/linux/jbd_common.h | 2 ++
  19  3 files changed, 2 insertions(+), 2 deletions(-)
  20
  21 diff --git a/include/linux/jbd.h b/include/linux/jbd.h
  22 index 2439054..8685d1b 100644
  23 --- a/include/linux/jbd.h
  24 +++ b/include/linux/jbd.h
  25 @@ -27,7 +27,6 @@
  26  #include <linux/buffer_head.h>
  27  #include <linux/journal-head.h>
  28  #include <linux/stddef.h>
  29 -#include <linux/bit_spinlock.h>
  30  #include <linux/mutex.h>
  31  #include <linux/timer.h>
  32  #include <linux/lockdep.h>
  33 diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
  34 index a79783f..25d9c9e 100644
  35 --- a/include/linux/jbd2.h
  36 +++ b/include/linux/jbd2.h
  37 @@ -26,7 +26,6 @@
  38  #include <linux/buffer_head.h>
  39  #include <linux/journal-head.h>
  40  #include <linux/stddef.h>
  41 -#include <linux/bit_spinlock.h>
  42  #include <linux/mutex.h>
  43  #include <linux/timer.h>
  44  #include <linux/slab.h>
  45 diff --git a/include/linux/jbd_common.h b/include/linux/jbd_common.h
  46 index b1f7089..3dc5343 100644
  47 --- a/include/linux/jbd_common.h
  48 +++ b/include/linux/jbd_common.h
  49 @@ -1,6 +1,8 @@
  50  #ifndef _LINUX_JBD_STATE_H
  51  #define _LINUX_JBD_STATE_H
  52
  53 +#include <linux/bit_spinlock.h>
  54 +
  55  static inline struct buffer_head *jh2bh(struct journal_head *jh)
  56  {
  57         return jh->b_bh;