diff options
| author | Jeff Mahoney <jeffm@novell.com> | 2004-10-18 09:07:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 09:07:32 -0700 |
| commit | 5b7b40f5b6b0a3407b0d6e6d70d3d20d58731255 (patch) | |
| tree | 7df4ae1f7d615a2be287ccadd2b6efb9b9026032 /include/linux | |
| parent | c6c051f20cd0d93c25ab2045086dfc8391557964 (diff) | |
[PATCH] ReiserFS: Cleanup access of journal (cosmetic)
This patch cleans up fs/reiserfs/journal.c such that repeated uses of
SB_JOURNAL(p_s_sb) are removed in favor of a local journal variable. The
compiler won't care, and it makes the code much easier to read.
Signed-off-by: Jeff Mahoney <jeffm@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/reiserfs_fs_sb.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h index 16d340b08e7d..aaf872453e5a 100644 --- a/include/linux/reiserfs_fs_sb.h +++ b/include/linux/reiserfs_fs_sb.h @@ -206,11 +206,11 @@ struct reiserfs_journal { int j_cnode_used ; /* number of cnodes on the used list */ int j_cnode_free ; /* number of cnodes on the free list */ - unsigned int s_journal_trans_max ; /* max number of blocks in a transaction. */ - unsigned int s_journal_max_batch ; /* max number of blocks to batch into a trans */ - unsigned int s_journal_max_commit_age ; /* in seconds, how old can an async commit be */ - unsigned int s_journal_default_max_commit_age ; /* the default for the max commit age */ - unsigned int s_journal_max_trans_age ; /* in seconds, how old can a transaction be */ + unsigned int j_trans_max ; /* max number of blocks in a transaction. */ + unsigned int j_max_batch ; /* max number of blocks to batch into a trans */ + unsigned int j_max_commit_age ; /* in seconds, how old can an async commit be */ + unsigned int j_max_trans_age ; /* in seconds, how old can a transaction be */ + unsigned int j_default_max_commit_age ; /* the default for the max commit age */ struct reiserfs_journal_cnode *j_cnode_free_list ; struct reiserfs_journal_cnode *j_cnode_free_orig ; /* orig pointer returned from vmalloc */ @@ -494,12 +494,6 @@ int reiserfs_resize(struct super_block *, unsigned long) ; #define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)->j_header_bh->) -#define SB_JOURNAL_TRANS_MAX(s) (SB_JOURNAL(s)->s_journal_trans_max) -#define SB_JOURNAL_MAX_BATCH(s) (SB_JOURNAL(s)->s_journal_max_batch) -#define SB_JOURNAL_MAX_COMMIT_AGE(s) (SB_JOURNAL(s)->s_journal_max_commit_age) -#define SB_JOURNAL_DEFAULT_MAX_COMMIT_AGE(s) (SB_JOURNAL(s)->s_journal_default_max_commit_age) -#define SB_JOURNAL_MAX_TRANS_AGE(s) (SB_JOURNAL(s)->s_journal_max_trans_age) - /* A safe version of the "bdevname", which returns the "s_id" field of * a superblock or else "Null superblock" if the super block is NULL. */ |