diff options
| author | Oleg Drokin <green@linuxhacker.ru> | 2004-11-10 21:41:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-10 21:41:26 -0800 |
| commit | fc0c58f5fc1f240903dea998d8239203f95e9b2d (patch) | |
| tree | 6e42d6a0eccdceef3c55b5ca03e74167bbfd8dc9 /include | |
| parent | c6da12a8f27556c5548542c532fecb32c5c2b3d8 (diff) | |
[PATCH] "Bad" naming of structures and functions in ext3 reservation code
The patch below renames struct reserve_window_node* and rsv_window_add()
function to struct ext3_reserve_window_node* and ext3_rsv_window_add().
This eases the task of having several ext3-derived filesystem drivers (with
different capabilities) in kernel.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ext3_fs.h | 2 | ||||
| -rw-r--r-- | include/linux/ext3_fs_i.h | 8 | ||||
| -rw-r--r-- | include/linux/ext3_fs_sb.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index d44abc7bd33a..5e0e52b0fc7e 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h @@ -722,7 +722,7 @@ extern struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb, unsigned int block_group, struct buffer_head ** bh); extern int ext3_should_retry_alloc(struct super_block *sb, int *retries); -extern void rsv_window_add(struct super_block *sb, struct reserve_window_node *rsv); +extern void ext3_rsv_window_add(struct super_block *sb, struct ext3_reserve_window_node *rsv); /* dir.c */ extern int ext3_check_dir_entry(const char *, struct inode *, diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h index c549633532de..328cd40c5ea4 100644 --- a/include/linux/ext3_fs_i.h +++ b/include/linux/ext3_fs_i.h @@ -20,17 +20,17 @@ #include <linux/rbtree.h> #include <linux/seqlock.h> -struct reserve_window { +struct ext3_reserve_window { __u32 _rsv_start; /* First byte reserved */ __u32 _rsv_end; /* Last byte reserved or 0 */ }; -struct reserve_window_node { +struct ext3_reserve_window_node { struct rb_node rsv_node; atomic_t rsv_goal_size; atomic_t rsv_alloc_hit; seqlock_t rsv_seqlock; - struct reserve_window rsv_window; + struct ext3_reserve_window rsv_window; }; #define rsv_start rsv_window._rsv_start @@ -76,7 +76,7 @@ struct ext3_inode_info { */ __u32 i_next_alloc_goal; /* block reservation window */ - struct reserve_window_node i_rsv_window; + struct ext3_reserve_window_node i_rsv_window; __u32 i_dir_start_lookup; #ifdef CONFIG_EXT3_FS_XATTR diff --git a/include/linux/ext3_fs_sb.h b/include/linux/ext3_fs_sb.h index ac5fb22c5b7c..f61309c81cc4 100644 --- a/include/linux/ext3_fs_sb.h +++ b/include/linux/ext3_fs_sb.h @@ -62,7 +62,7 @@ struct ext3_sb_info { /* root of the per fs reservation window tree */ spinlock_t s_rsv_window_lock; struct rb_root s_rsv_window_root; - struct reserve_window_node s_rsv_window_head; + struct ext3_reserve_window_node s_rsv_window_head; /* Journaling */ struct inode * s_journal_inode; |