summaryrefslogtreecommitdiffstats
path: root/include/linux/ext4_fs_sb.h
diff options
context:
space:
mode:
authorMingming Cao <cmm@us.ibm.com>2006-10-11 01:20:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 11:14:15 -0700
commit617ba13b31fbf505cc21799826639ef24ed94af0 (patch)
tree2a41e8c993f7c1eed115ad24047d546ba56cbdf5 /include/linux/ext4_fs_sb.h
parentac27a0ec112a089f1a5102bc8dffc79c8c815571 (diff)
downloadop-kernel-dev-617ba13b31fbf505cc21799826639ef24ed94af0.zip
op-kernel-dev-617ba13b31fbf505cc21799826639ef24ed94af0.tar.gz
[PATCH] ext4: rename ext4 symbols to avoid duplication of ext3 symbols
Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/ext4_fs_sb.h')
-rw-r--r--include/linux/ext4_fs_sb.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/ext4_fs_sb.h b/include/linux/ext4_fs_sb.h
index f61309c..ce4856d 100644
--- a/include/linux/ext4_fs_sb.h
+++ b/include/linux/ext4_fs_sb.h
@@ -1,5 +1,5 @@
/*
- * linux/include/linux/ext3_fs_sb.h
+ * linux/include/linux/ext4_fs_sb.h
*
* Copyright (C) 1992, 1993, 1994, 1995
* Remy Card (card@masi.ibp.fr)
@@ -13,8 +13,8 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
-#ifndef _LINUX_EXT3_FS_SB
-#define _LINUX_EXT3_FS_SB
+#ifndef _LINUX_EXT4_FS_SB
+#define _LINUX_EXT4_FS_SB
#ifdef __KERNEL__
#include <linux/timer.h>
@@ -27,7 +27,7 @@
/*
* third extended-fs super-block data in memory
*/
-struct ext3_sb_info {
+struct ext4_sb_info {
unsigned long s_frag_size; /* Size of a fragment in bytes */
unsigned long s_frags_per_block;/* Number of fragments per block */
unsigned long s_inodes_per_block;/* Number of inodes per block */
@@ -39,7 +39,7 @@ struct ext3_sb_info {
unsigned long s_desc_per_block; /* Number of group descriptors per block */
unsigned long s_groups_count; /* Number of groups in the fs */
struct buffer_head * s_sbh; /* Buffer containing the super block */
- struct ext3_super_block * s_es; /* Pointer to the super block in the buffer */
+ struct ext4_super_block * s_es; /* Pointer to the super block in the buffer */
struct buffer_head ** s_group_desc;
unsigned long s_mount_opt;
uid_t s_resuid;
@@ -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 ext3_reserve_window_node s_rsv_window_head;
+ struct ext4_reserve_window_node s_rsv_window_head;
/* Journaling */
struct inode * s_journal_inode;
@@ -80,4 +80,4 @@ struct ext3_sb_info {
#endif
};
-#endif /* _LINUX_EXT3_FS_SB */
+#endif /* _LINUX_EXT4_FS_SB */
OpenPOWER on IntegriCloud