kernel.h: update comment about simple_strto<foo>() functions

[sfrench/cifs-2.6.git] / include / linux / journal-head.h

diff --git a/include/linux/journal-head.h b/include/linux/journal-head.h
index 9fb870524314548de86ea51fb476de685c5cddb8..75bc56109031f74ee18497d4bcdc8703c57e4f3c 100644 (file)
--- a/include/linux/journal-head.h
+++ b/include/linux/journal-head.h
@@ -11,6 +11,8 @@
 #ifndef JOURNAL_HEAD_H_INCLUDED
 #define JOURNAL_HEAD_H_INCLUDED
 
+#include <linux/spinlock.h>
+
 typedef unsigned int           tid_t;          /* Unique transaction ID */
 typedef struct transaction_s   transaction_t;  /* Compound transaction type */
 
@@ -23,6 +25,11 @@ struct journal_head {
         */
        struct buffer_head *b_bh;
 
+       /*
+        * Protect the buffer head state
+        */
+       spinlock_t b_state_lock;
+
        /*
         * Reference count - see description in journal.c
         * [jbd_lock_bh_journal_head()]
@@ -30,7 +37,7 @@ struct journal_head {
        int b_jcount;
 
        /*
-        * Journalling list for this buffer [jbd_lock_bh_state()]
+        * Journalling list for this buffer [b_state_lock]
         * NOTE: We *cannot* combine this with b_modified into a bitfield
         * as gcc would then (which the C standard allows but which is
         * very unuseful) make 64-bit accesses to the bitfield and clobber
@@ -41,20 +48,20 @@ struct journal_head {
        /*
         * This flag signals the buffer has been modified by
         * the currently running transaction
-        * [jbd_lock_bh_state()]
+        * [b_state_lock]
         */
        unsigned b_modified;
 
        /*
         * Copy of the buffer data frozen for writing to the log.
-        * [jbd_lock_bh_state()]
+        * [b_state_lock]
         */
        char *b_frozen_data;
 
        /*
         * Pointer to a saved copy of the buffer containing no uncommitted
         * deallocation references, so that allocations can avoid overwriting
-        * uncommitted deletes. [jbd_lock_bh_state()]
+        * uncommitted deletes. [b_state_lock]
         */
        char *b_committed_data;
 
@@ -63,7 +70,7 @@ struct journal_head {
         * metadata: either the running transaction or the committing
         * transaction (if there is one).  Only applies to buffers on a
         * transaction's data or metadata journaling list.
-        * [j_list_lock] [jbd_lock_bh_state()]
+        * [j_list_lock] [b_state_lock]
         * Either of these locks is enough for reading, both are needed for
         * changes.
         */
@@ -73,13 +80,13 @@ struct journal_head {
         * Pointer to the running compound transaction which is currently
         * modifying the buffer's metadata, if there was already a transaction
         * committing it when the new transaction touched it.
-        * [t_list_lock] [jbd_lock_bh_state()]
+        * [t_list_lock] [b_state_lock]
         */
        transaction_t *b_next_transaction;
 
        /*
         * Doubly-linked list of buffers on a transaction's data, metadata or
-        * forget queue. [t_list_lock] [jbd_lock_bh_state()]
+        * forget queue. [t_list_lock] [b_state_lock]
         */
        struct journal_head *b_tnext, *b_tprev;