reiserfs: audit transaction ids to always be unsigned ints

This patch fixes up the reiserfs code such that transaction ids are
always unsigned ints.  In places they can currently be signed ints or
unsigned longs.

The former just causes an annoying clm-2200 warning and may join a
transaction when it should wait.

The latter is just for correctness since the disk format uses a 32-bit
transaction id.  There aren't any runtime problems that result from it
not wrapping at the correct location since the value is truncated
correctly even on big endian systems.  The 0 value might make it to
disk, but the mount-time checks will bump it to 10 itself.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index ab748a03fe97..bd52b949f8c9 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1676,7 +1676,7 @@ struct reiserfs_transaction_handle {
         int t_refcount;
         int t_blocks_logged;    /* number of blocks this writer has logged */
         int t_blocks_allocated; /* number of blocks this writer allocated */
-        unsigned long t_trans_id;       /* sanity check, equals the current trans id */
+        unsigned int t_trans_id;        /* sanity check, equals the current trans id */
         void *t_handle_save;    /* save existing current->journal_info */
         unsigned displace_new_blocks:1; /* if new block allocation occurres, that block
                                            should be displaced from others */
diff --git a/include/linux/reiserfs_fs_i.h b/include/linux/reiserfs_fs_i.h
index ce3663fb0101..201dd910b042 100644
--- a/include/linux/reiserfs_fs_i.h
+++ b/include/linux/reiserfs_fs_i.h
@@ -51,7 +51,7 @@ struct reiserfs_inode_info {
         /* we use these for fsync or O_SYNC to decide which transaction
          ** needs to be committed in order for this inode to be properly
          ** flushed */
-        unsigned long i_trans_id;
+        unsigned int i_trans_id;
         struct reiserfs_journal_list *i_jl;
         struct mutex i_mmap;
 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index ccd38f351530..12fc2a0d13be 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -156,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 */
@@ -185,7 +185,7 @@ struct reiserfs_journal {
         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 */
@@ -226,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;