reiserfs: eliminate per-super xattr lock

[net-next-2.6.git] / include / linux / reiserfs_fs_sb.h

diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 315517e8bfa1cdd6704f4a9620ca8a3d8c7f5d2a..c8aee41ccc237341748bf4f32cbe241853575bb2 100644 (file)
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -73,6 +73,9 @@ typedef enum {
 #define sb_version(sbp)            (le16_to_cpu((sbp)->s_v1.s_version))
 #define set_sb_version(sbp,v)      ((sbp)->s_v1.s_version = cpu_to_le16(v))
 
+#define sb_mnt_count(sbp)         (le16_to_cpu((sbp)->s_mnt_count))
+#define set_sb_mnt_count(sbp, v)   ((sbp)->s_mnt_count = cpu_to_le16(v))
+
 #define sb_reserved_for_journal(sbp) \
               (le16_to_cpu((sbp)->s_v1.s_reserved_for_journal))
 #define set_sb_reserved_for_journal(sbp,v) \
@@ -153,7 +156,7 @@ struct reiserfs_journal_list {
        atomic_t j_commit_left;
        atomic_t j_older_commits_done;  /* all commits older than this on disk */
        struct mutex j_commit_mutex;
-       unsigned long j_trans_id;
+       unsigned int j_trans_id;
        time_t j_timestamp;
        struct reiserfs_list_bitmap *j_list_bitmap;
        struct buffer_head *j_commit_bh;        /* commit buffer head */
@@ -178,10 +181,11 @@ struct reiserfs_journal {
        struct reiserfs_journal_cnode *j_first; /*  oldest journal block.  start here for traverse */
 
        struct block_device *j_dev_bd;
+       fmode_t j_dev_mode;
        int j_1st_reserved_block;       /* first block on s_dev of reserved area journal */
 
        unsigned long j_state;
-       unsigned long j_trans_id;
+       unsigned int j_trans_id;
        unsigned long j_mount_id;
        unsigned long j_start;  /* start of current waiting commit (index into j_ap_blocks) */
        unsigned long j_len;    /* length of current waiting commit */
@@ -222,10 +226,10 @@ struct reiserfs_journal {
        int j_num_work_lists;   /* number that need attention from kreiserfsd */
 
        /* debugging to make sure things are flushed in order */
-       int j_last_flush_id;
+       unsigned int j_last_flush_id;
 
        /* debugging to make sure things are committed in order */
-       int j_last_commit_id;
+       unsigned int j_last_commit_id;
 
        struct list_head j_bitmap_nodes;
        struct list_head j_dirty_buffers;
@@ -398,10 +402,7 @@ struct reiserfs_sb_info {
        int reserved_blocks;    /* amount of blocks reserved for further allocations */
        spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */
        struct dentry *priv_root;       /* root of /.reiserfs_priv */
-#ifdef CONFIG_REISERFS_FS_XATTR
        struct dentry *xattr_root;      /* root of /.reiserfs_priv/.xa */
-       struct rw_semaphore xattr_dir_sem;
-#endif
        int j_errno;
 #ifdef CONFIG_QUOTA
        char *s_qf_names[MAXQUOTAS];