aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMingming Cao <cmm@us.ibm.com>2006-10-11 04:20:53 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 14:14:15 -0400
commit617ba13b31fbf505cc21799826639ef24ed94af0 (patch)
tree2a41e8c993f7c1eed115ad24047d546ba56cbdf5 /include/linux
parentac27a0ec112a089f1a5102bc8dffc79c8c815571 (diff)
[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')
-rw-r--r--include/linux/ext4_fs.h702
-rw-r--r--include/linux/ext4_fs_i.h56
-rw-r--r--include/linux/ext4_fs_sb.h14
-rw-r--r--include/linux/ext4_jbd.h160
4 files changed, 466 insertions, 466 deletions
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
index 11cca1bdc0c7..f582cd762caf 100644
--- a/include/linux/ext4_fs.h
+++ b/include/linux/ext4_fs.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/ext3_fs.h 2 * linux/include/linux/ext4_fs.h
3 * 3 *
4 * Copyright (C) 1992, 1993, 1994, 1995 4 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr) 5 * Remy Card (card@masi.ibp.fr)
@@ -13,8 +13,8 @@
13 * Copyright (C) 1991, 1992 Linus Torvalds 13 * Copyright (C) 1991, 1992 Linus Torvalds
14 */ 14 */
15 15
16#ifndef _LINUX_EXT3_FS_H 16#ifndef _LINUX_EXT4_FS_H
17#define _LINUX_EXT3_FS_H 17#define _LINUX_EXT4_FS_H
18 18
19#include <linux/types.h> 19#include <linux/types.h>
20#include <linux/magic.h> 20#include <linux/magic.h>
@@ -24,102 +24,102 @@
24 */ 24 */
25 25
26/* 26/*
27 * Define EXT3FS_DEBUG to produce debug messages 27 * Define EXT4FS_DEBUG to produce debug messages
28 */ 28 */
29#undef EXT3FS_DEBUG 29#undef EXT4FS_DEBUG
30 30
31/* 31/*
32 * Define EXT3_RESERVATION to reserve data blocks for expanding files 32 * Define EXT4_RESERVATION to reserve data blocks for expanding files
33 */ 33 */
34#define EXT3_DEFAULT_RESERVE_BLOCKS 8 34#define EXT4_DEFAULT_RESERVE_BLOCKS 8
35/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */ 35/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */
36#define EXT3_MAX_RESERVE_BLOCKS 1027 36#define EXT4_MAX_RESERVE_BLOCKS 1027
37#define EXT3_RESERVE_WINDOW_NOT_ALLOCATED 0 37#define EXT4_RESERVE_WINDOW_NOT_ALLOCATED 0
38/* 38/*
39 * Always enable hashed directories 39 * Always enable hashed directories
40 */ 40 */
41#define CONFIG_EXT3_INDEX 41#define CONFIG_EXT4_INDEX
42 42
43/* 43/*
44 * Debug code 44 * Debug code
45 */ 45 */
46#ifdef EXT3FS_DEBUG 46#ifdef EXT4FS_DEBUG
47#define ext3_debug(f, a...) \ 47#define ext4_debug(f, a...) \
48 do { \ 48 do { \
49 printk (KERN_DEBUG "EXT3-fs DEBUG (%s, %d): %s:", \ 49 printk (KERN_DEBUG "EXT4-fs DEBUG (%s, %d): %s:", \
50 __FILE__, __LINE__, __FUNCTION__); \ 50 __FILE__, __LINE__, __FUNCTION__); \
51 printk (KERN_DEBUG f, ## a); \ 51 printk (KERN_DEBUG f, ## a); \
52 } while (0) 52 } while (0)
53#else 53#else
54#define ext3_debug(f, a...) do {} while (0) 54#define ext4_debug(f, a...) do {} while (0)
55#endif 55#endif
56 56
57/* 57/*
58 * Special inodes numbers 58 * Special inodes numbers
59 */ 59 */
60#define EXT3_BAD_INO 1 /* Bad blocks inode */ 60#define EXT4_BAD_INO 1 /* Bad blocks inode */
61#define EXT3_ROOT_INO 2 /* Root inode */ 61#define EXT4_ROOT_INO 2 /* Root inode */
62#define EXT3_BOOT_LOADER_INO 5 /* Boot loader inode */ 62#define EXT4_BOOT_LOADER_INO 5 /* Boot loader inode */
63#define EXT3_UNDEL_DIR_INO 6 /* Undelete directory inode */ 63#define EXT4_UNDEL_DIR_INO 6 /* Undelete directory inode */
64#define EXT3_RESIZE_INO 7 /* Reserved group descriptors inode */ 64#define EXT4_RESIZE_INO 7 /* Reserved group descriptors inode */
65#define EXT3_JOURNAL_INO 8 /* Journal inode */ 65#define EXT4_JOURNAL_INO 8 /* Journal inode */
66 66
67/* First non-reserved inode for old ext3 filesystems */ 67/* First non-reserved inode for old ext4 filesystems */
68#define EXT3_GOOD_OLD_FIRST_INO 11 68#define EXT4_GOOD_OLD_FIRST_INO 11
69 69
70/* 70/*
71 * Maximal count of links to a file 71 * Maximal count of links to a file
72 */ 72 */
73#define EXT3_LINK_MAX 32000 73#define EXT4_LINK_MAX 32000
74 74
75/* 75/*
76 * Macro-instructions used to manage several block sizes 76 * Macro-instructions used to manage several block sizes
77 */ 77 */
78#define EXT3_MIN_BLOCK_SIZE 1024 78#define EXT4_MIN_BLOCK_SIZE 1024
79#define EXT3_MAX_BLOCK_SIZE 4096 79#define EXT4_MAX_BLOCK_SIZE 4096
80#define EXT3_MIN_BLOCK_LOG_SIZE 10 80#define EXT4_MIN_BLOCK_LOG_SIZE 10
81#ifdef __KERNEL__ 81#ifdef __KERNEL__
82# define EXT3_BLOCK_SIZE(s) ((s)->s_blocksize) 82# define EXT4_BLOCK_SIZE(s) ((s)->s_blocksize)
83#else 83#else
84# define EXT3_BLOCK_SIZE(s) (EXT3_MIN_BLOCK_SIZE << (s)->s_log_block_size) 84# define EXT4_BLOCK_SIZE(s) (EXT4_MIN_BLOCK_SIZE << (s)->s_log_block_size)
85#endif 85#endif
86#define EXT3_ADDR_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / sizeof (__u32)) 86#define EXT4_ADDR_PER_BLOCK(s) (EXT4_BLOCK_SIZE(s) / sizeof (__u32))
87#ifdef __KERNEL__ 87#ifdef __KERNEL__
88# define EXT3_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) 88# define EXT4_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits)
89#else 89#else
90# define EXT3_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) 90# define EXT4_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10)
91#endif 91#endif
92#ifdef __KERNEL__ 92#ifdef __KERNEL__
93#define EXT3_ADDR_PER_BLOCK_BITS(s) (EXT3_SB(s)->s_addr_per_block_bits) 93#define EXT4_ADDR_PER_BLOCK_BITS(s) (EXT4_SB(s)->s_addr_per_block_bits)
94#define EXT3_INODE_SIZE(s) (EXT3_SB(s)->s_inode_size) 94#define EXT4_INODE_SIZE(s) (EXT4_SB(s)->s_inode_size)
95#define EXT3_FIRST_INO(s) (EXT3_SB(s)->s_first_ino) 95#define EXT4_FIRST_INO(s) (EXT4_SB(s)->s_first_ino)
96#else 96#else
97#define EXT3_INODE_SIZE(s) (((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? \ 97#define EXT4_INODE_SIZE(s) (((s)->s_rev_level == EXT4_GOOD_OLD_REV) ? \
98 EXT3_GOOD_OLD_INODE_SIZE : \ 98 EXT4_GOOD_OLD_INODE_SIZE : \
99 (s)->s_inode_size) 99 (s)->s_inode_size)
100#define EXT3_FIRST_INO(s) (((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? \ 100#define EXT4_FIRST_INO(s) (((s)->s_rev_level == EXT4_GOOD_OLD_REV) ? \
101 EXT3_GOOD_OLD_FIRST_INO : \ 101 EXT4_GOOD_OLD_FIRST_INO : \
102 (s)->s_first_ino) 102 (s)->s_first_ino)
103#endif 103#endif
104 104
105/* 105/*
106 * Macro-instructions used to manage fragments 106 * Macro-instructions used to manage fragments
107 */ 107 */
108#define EXT3_MIN_FRAG_SIZE 1024 108#define EXT4_MIN_FRAG_SIZE 1024
109#define EXT3_MAX_FRAG_SIZE 4096 109#define EXT4_MAX_FRAG_SIZE 4096
110#define EXT3_MIN_FRAG_LOG_SIZE 10 110#define EXT4_MIN_FRAG_LOG_SIZE 10
111#ifdef __KERNEL__ 111#ifdef __KERNEL__
112# define EXT3_FRAG_SIZE(s) (EXT3_SB(s)->s_frag_size) 112# define EXT4_FRAG_SIZE(s) (EXT4_SB(s)->s_frag_size)
113# define EXT3_FRAGS_PER_BLOCK(s) (EXT3_SB(s)->s_frags_per_block) 113# define EXT4_FRAGS_PER_BLOCK(s) (EXT4_SB(s)->s_frags_per_block)
114#else 114#else
115# define EXT3_FRAG_SIZE(s) (EXT3_MIN_FRAG_SIZE << (s)->s_log_frag_size) 115# define EXT4_FRAG_SIZE(s) (EXT4_MIN_FRAG_SIZE << (s)->s_log_frag_size)
116# define EXT3_FRAGS_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / EXT3_FRAG_SIZE(s)) 116# define EXT4_FRAGS_PER_BLOCK(s) (EXT4_BLOCK_SIZE(s) / EXT4_FRAG_SIZE(s))
117#endif 117#endif
118 118
119/* 119/*
120 * Structure of a blocks group descriptor 120 * Structure of a blocks group descriptor
121 */ 121 */
122struct ext3_group_desc 122struct ext4_group_desc
123{ 123{
124 __le32 bg_block_bitmap; /* Blocks bitmap block */ 124 __le32 bg_block_bitmap; /* Blocks bitmap block */
125 __le32 bg_inode_bitmap; /* Inodes bitmap block */ 125 __le32 bg_inode_bitmap; /* Inodes bitmap block */
@@ -135,62 +135,62 @@ struct ext3_group_desc
135 * Macro-instructions used to manage group descriptors 135 * Macro-instructions used to manage group descriptors
136 */ 136 */
137#ifdef __KERNEL__ 137#ifdef __KERNEL__
138# define EXT3_BLOCKS_PER_GROUP(s) (EXT3_SB(s)->s_blocks_per_group) 138# define EXT4_BLOCKS_PER_GROUP(s) (EXT4_SB(s)->s_blocks_per_group)
139# define EXT3_DESC_PER_BLOCK(s) (EXT3_SB(s)->s_desc_per_block) 139# define EXT4_DESC_PER_BLOCK(s) (EXT4_SB(s)->s_desc_per_block)
140# define EXT3_INODES_PER_GROUP(s) (EXT3_SB(s)->s_inodes_per_group) 140# define EXT4_INODES_PER_GROUP(s) (EXT4_SB(s)->s_inodes_per_group)
141# define EXT3_DESC_PER_BLOCK_BITS(s) (EXT3_SB(s)->s_desc_per_block_bits) 141# define EXT4_DESC_PER_BLOCK_BITS(s) (EXT4_SB(s)->s_desc_per_block_bits)
142#else 142#else
143# define EXT3_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) 143# define EXT4_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group)
144# define EXT3_DESC_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / sizeof (struct ext3_group_desc)) 144# define EXT4_DESC_PER_BLOCK(s) (EXT4_BLOCK_SIZE(s) / sizeof (struct ext4_group_desc))
145# define EXT3_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) 145# define EXT4_INODES_PER_GROUP(s) ((s)->s_inodes_per_group)
146#endif 146#endif
147 147
148/* 148/*
149 * Constants relative to the data blocks 149 * Constants relative to the data blocks
150 */ 150 */
151#define EXT3_NDIR_BLOCKS 12 151#define EXT4_NDIR_BLOCKS 12
152#define EXT3_IND_BLOCK EXT3_NDIR_BLOCKS 152#define EXT4_IND_BLOCK EXT4_NDIR_BLOCKS
153#define EXT3_DIND_BLOCK (EXT3_IND_BLOCK + 1) 153#define EXT4_DIND_BLOCK (EXT4_IND_BLOCK + 1)
154#define EXT3_TIND_BLOCK (EXT3_DIND_BLOCK + 1) 154#define EXT4_TIND_BLOCK (EXT4_DIND_BLOCK + 1)
155#define EXT3_N_BLOCKS (EXT3_TIND_BLOCK + 1) 155#define EXT4_N_BLOCKS (EXT4_TIND_BLOCK + 1)
156 156
157/* 157/*
158 * Inode flags 158 * Inode flags
159 */ 159 */
160#define EXT3_SECRM_FL 0x00000001 /* Secure deletion */ 160#define EXT4_SECRM_FL 0x00000001 /* Secure deletion */
161#define EXT3_UNRM_FL 0x00000002 /* Undelete */ 161#define EXT4_UNRM_FL 0x00000002 /* Undelete */
162#define EXT3_COMPR_FL 0x00000004 /* Compress file */ 162#define EXT4_COMPR_FL 0x00000004 /* Compress file */
163#define EXT3_SYNC_FL 0x00000008 /* Synchronous updates */ 163#define EXT4_SYNC_FL 0x00000008 /* Synchronous updates */
164#define EXT3_IMMUTABLE_FL 0x00000010 /* Immutable file */ 164#define EXT4_IMMUTABLE_FL 0x00000010 /* Immutable file */
165#define EXT3_APPEND_FL 0x00000020 /* writes to file may only append */ 165#define EXT4_APPEND_FL 0x00000020 /* writes to file may only append */
166#define EXT3_NODUMP_FL 0x00000040 /* do not dump file */ 166#define EXT4_NODUMP_FL 0x00000040 /* do not dump file */
167#define EXT3_NOATIME_FL 0x00000080 /* do not update atime */ 167#define EXT4_NOATIME_FL 0x00000080 /* do not update atime */
168/* Reserved for compression usage... */ 168/* Reserved for compression usage... */
169#define EXT3_DIRTY_FL 0x00000100 169#define EXT4_DIRTY_FL 0x00000100
170#define EXT3_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ 170#define EXT4_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */
171#define EXT3_NOCOMPR_FL 0x00000400 /* Don't compress */ 171#define EXT4_NOCOMPR_FL 0x00000400 /* Don't compress */
172#define EXT3_ECOMPR_FL 0x00000800 /* Compression error */ 172#define EXT4_ECOMPR_FL 0x00000800 /* Compression error */
173/* End compression flags --- maybe not all used */ 173/* End compression flags --- maybe not all used */
174#define EXT3_INDEX_FL 0x00001000 /* hash-indexed directory */ 174#define EXT4_INDEX_FL 0x00001000 /* hash-indexed directory */
175#define EXT3_IMAGIC_FL 0x00002000 /* AFS directory */ 175#define EXT4_IMAGIC_FL 0x00002000 /* AFS directory */
176#define EXT3_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */ 176#define EXT4_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */
177#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */ 177#define EXT4_NOTAIL_FL 0x00008000 /* file tail should not be merged */
178#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ 178#define EXT4_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
179#define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ 179#define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
180#define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */ 180#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
181 181
182#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ 182#define EXT4_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
183#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ 183#define EXT4_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
184 184
185/* 185/*
186 * Inode dynamic state flags 186 * Inode dynamic state flags
187 */ 187 */
188#define EXT3_STATE_JDATA 0x00000001 /* journaled data exists */ 188#define EXT4_STATE_JDATA 0x00000001 /* journaled data exists */
189#define EXT3_STATE_NEW 0x00000002 /* inode is newly created */ 189#define EXT4_STATE_NEW 0x00000002 /* inode is newly created */
190#define EXT3_STATE_XATTR 0x00000004 /* has in-inode xattrs */ 190#define EXT4_STATE_XATTR 0x00000004 /* has in-inode xattrs */
191 191
192/* Used to pass group descriptor data when online resize is done */ 192/* Used to pass group descriptor data when online resize is done */
193struct ext3_new_group_input { 193struct ext4_new_group_input {
194 __u32 group; /* Group number for this data */ 194 __u32 group; /* Group number for this data */
195 __u32 block_bitmap; /* Absolute block number of block bitmap */ 195 __u32 block_bitmap; /* Absolute block number of block bitmap */
196 __u32 inode_bitmap; /* Absolute block number of inode bitmap */ 196 __u32 inode_bitmap; /* Absolute block number of inode bitmap */
@@ -200,8 +200,8 @@ struct ext3_new_group_input {
200 __u16 unused; 200 __u16 unused;
201}; 201};
202 202
203/* The struct ext3_new_group_input in kernel space, with free_blocks_count */ 203/* The struct ext4_new_group_input in kernel space, with free_blocks_count */
204struct ext3_new_group_data { 204struct ext4_new_group_data {
205 __u32 group; 205 __u32 group;
206 __u32 block_bitmap; 206 __u32 block_bitmap;
207 __u32 inode_bitmap; 207 __u32 inode_bitmap;
@@ -216,41 +216,41 @@ struct ext3_new_group_data {
216/* 216/*
217 * ioctl commands 217 * ioctl commands
218 */ 218 */
219#define EXT3_IOC_GETFLAGS FS_IOC_GETFLAGS 219#define EXT4_IOC_GETFLAGS FS_IOC_GETFLAGS
220#define EXT3_IOC_SETFLAGS FS_IOC_SETFLAGS 220#define EXT4_IOC_SETFLAGS FS_IOC_SETFLAGS
221#define EXT3_IOC_GETVERSION _IOR('f', 3, long) 221#define EXT4_IOC_GETVERSION _IOR('f', 3, long)
222#define EXT3_IOC_SETVERSION _IOW('f', 4, long) 222#define EXT4_IOC_SETVERSION _IOW('f', 4, long)
223#define EXT3_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) 223#define EXT4_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long)
224#define EXT3_IOC_GROUP_ADD _IOW('f', 8,struct ext3_new_group_input) 224#define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input)
225#define EXT3_IOC_GETVERSION_OLD FS_IOC_GETVERSION 225#define EXT4_IOC_GETVERSION_OLD FS_IOC_GETVERSION
226#define EXT3_IOC_SETVERSION_OLD FS_IOC_SETVERSION 226#define EXT4_IOC_SETVERSION_OLD FS_IOC_SETVERSION
227#ifdef CONFIG_JBD_DEBUG 227#ifdef CONFIG_JBD_DEBUG
228#define EXT3_IOC_WAIT_FOR_READONLY _IOR('f', 99, long) 228#define EXT4_IOC_WAIT_FOR_READONLY _IOR('f', 99, long)
229#endif 229#endif
230#define EXT3_IOC_GETRSVSZ _IOR('f', 5, long) 230#define EXT4_IOC_GETRSVSZ _IOR('f', 5, long)
231#define EXT3_IOC_SETRSVSZ _IOW('f', 6, long) 231#define EXT4_IOC_SETRSVSZ _IOW('f', 6, long)
232 232
233/* 233/*
234 * ioctl commands in 32 bit emulation 234 * ioctl commands in 32 bit emulation
235 */ 235 */
236#define EXT3_IOC32_GETFLAGS FS_IOC32_GETFLAGS 236#define EXT4_IOC32_GETFLAGS FS_IOC32_GETFLAGS
237#define EXT3_IOC32_SETFLAGS FS_IOC32_SETFLAGS 237#define EXT4_IOC32_SETFLAGS FS_IOC32_SETFLAGS
238#define EXT3_IOC32_GETVERSION _IOR('f', 3, int) 238#define EXT4_IOC32_GETVERSION _IOR('f', 3, int)
239#define EXT3_IOC32_SETVERSION _IOW('f', 4, int) 239#define EXT4_IOC32_SETVERSION _IOW('f', 4, int)
240#define EXT3_IOC32_GETRSVSZ _IOR('f', 5, int) 240#define EXT4_IOC32_GETRSVSZ _IOR('f', 5, int)
241#define EXT3_IOC32_SETRSVSZ _IOW('f', 6, int) 241#define EXT4_IOC32_SETRSVSZ _IOW('f', 6, int)
242#define EXT3_IOC32_GROUP_EXTEND _IOW('f', 7, unsigned int) 242#define EXT4_IOC32_GROUP_EXTEND _IOW('f', 7, unsigned int)
243#ifdef CONFIG_JBD_DEBUG 243#ifdef CONFIG_JBD_DEBUG
244#define EXT3_IOC32_WAIT_FOR_READONLY _IOR('f', 99, int) 244#define EXT4_IOC32_WAIT_FOR_READONLY _IOR('f', 99, int)
245#endif 245#endif
246#define EXT3_IOC32_GETVERSION_OLD FS_IOC32_GETVERSION 246#define EXT4_IOC32_GETVERSION_OLD FS_IOC32_GETVERSION
247#define EXT3_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION 247#define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION
248 248
249 249
250/* 250/*
251 * Mount options 251 * Mount options
252 */ 252 */
253struct ext3_mount_options { 253struct ext4_mount_options {
254 unsigned long s_mount_opt; 254 unsigned long s_mount_opt;
255 uid_t s_resuid; 255 uid_t s_resuid;
256 gid_t s_resgid; 256 gid_t s_resgid;
@@ -264,7 +264,7 @@ struct ext3_mount_options {
264/* 264/*
265 * Structure of an inode on the disk 265 * Structure of an inode on the disk
266 */ 266 */
267struct ext3_inode { 267struct ext4_inode {
268 __le16 i_mode; /* File mode */ 268 __le16 i_mode; /* File mode */
269 __le16 i_uid; /* Low 16 bits of Owner Uid */ 269 __le16 i_uid; /* Low 16 bits of Owner Uid */
270 __le32 i_size; /* Size in bytes */ 270 __le32 i_size; /* Size in bytes */
@@ -287,7 +287,7 @@ struct ext3_inode {
287 __u32 m_i_reserved1; 287 __u32 m_i_reserved1;
288 } masix1; 288 } masix1;
289 } osd1; /* OS dependent 1 */ 289 } osd1; /* OS dependent 1 */
290 __le32 i_block[EXT3_N_BLOCKS];/* Pointers to blocks */ 290 __le32 i_block[EXT4_N_BLOCKS];/* Pointers to blocks */
291 __le32 i_generation; /* File version (for NFS) */ 291 __le32 i_generation; /* File version (for NFS) */
292 __le32 i_file_acl; /* File ACL */ 292 __le32 i_file_acl; /* File ACL */
293 __le32 i_dir_acl; /* Directory ACL */ 293 __le32 i_dir_acl; /* Directory ACL */
@@ -353,76 +353,76 @@ struct ext3_inode {
353/* 353/*
354 * File system states 354 * File system states
355 */ 355 */
356#define EXT3_VALID_FS 0x0001 /* Unmounted cleanly */ 356#define EXT4_VALID_FS 0x0001 /* Unmounted cleanly */
357#define EXT3_ERROR_FS 0x0002 /* Errors detected */ 357#define EXT4_ERROR_FS 0x0002 /* Errors detected */
358#define EXT3_ORPHAN_FS 0x0004 /* Orphans being recovered */ 358#define EXT4_ORPHAN_FS 0x0004 /* Orphans being recovered */
359 359
360/* 360/*
361 * Mount flags 361 * Mount flags
362 */ 362 */
363#define EXT3_MOUNT_CHECK 0x00001 /* Do mount-time checks */ 363#define EXT4_MOUNT_CHECK 0x00001 /* Do mount-time checks */
364#define EXT3_MOUNT_OLDALLOC 0x00002 /* Don't use the new Orlov allocator */ 364#define EXT4_MOUNT_OLDALLOC 0x00002 /* Don't use the new Orlov allocator */
365#define EXT3_MOUNT_GRPID 0x00004 /* Create files with directory's group */ 365#define EXT4_MOUNT_GRPID 0x00004 /* Create files with directory's group */
366#define EXT3_MOUNT_DEBUG 0x00008 /* Some debugging messages */ 366#define EXT4_MOUNT_DEBUG 0x00008 /* Some debugging messages */
367#define EXT3_MOUNT_ERRORS_CONT 0x00010 /* Continue on errors */ 367#define EXT4_MOUNT_ERRORS_CONT 0x00010 /* Continue on errors */
368#define EXT3_MOUNT_ERRORS_RO 0x00020 /* Remount fs ro on errors */ 368#define EXT4_MOUNT_ERRORS_RO 0x00020 /* Remount fs ro on errors */
369#define EXT3_MOUNT_ERRORS_PANIC 0x00040 /* Panic on errors */ 369#define EXT4_MOUNT_ERRORS_PANIC 0x00040 /* Panic on errors */
370#define EXT3_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */ 370#define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */
371#define EXT3_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/ 371#define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/
372#define EXT3_MOUNT_ABORT 0x00200 /* Fatal error detected */ 372#define EXT4_MOUNT_ABORT 0x00200 /* Fatal error detected */
373#define EXT3_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */ 373#define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */
374#define EXT3_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */ 374#define EXT4_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */
375#define EXT3_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */ 375#define EXT4_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */
376#define EXT3_MOUNT_WRITEBACK_DATA 0x00C00 /* No data ordering */ 376#define EXT4_MOUNT_WRITEBACK_DATA 0x00C00 /* No data ordering */
377#define EXT3_MOUNT_UPDATE_JOURNAL 0x01000 /* Update the journal format */ 377#define EXT4_MOUNT_UPDATE_JOURNAL 0x01000 /* Update the journal format */
378#define EXT3_MOUNT_NO_UID32 0x02000 /* Disable 32-bit UIDs */ 378#define EXT4_MOUNT_NO_UID32 0x02000 /* Disable 32-bit UIDs */
379#define EXT3_MOUNT_XATTR_USER 0x04000 /* Extended user attributes */ 379#define EXT4_MOUNT_XATTR_USER 0x04000 /* Extended user attributes */
380#define EXT3_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */ 380#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
381#define EXT3_MOUNT_RESERVATION 0x10000 /* Preallocation */ 381#define EXT4_MOUNT_RESERVATION 0x10000 /* Preallocation */
382#define EXT3_MOUNT_BARRIER 0x20000 /* Use block barriers */ 382#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
383#define EXT3_MOUNT_NOBH 0x40000 /* No bufferheads */ 383#define EXT4_MOUNT_NOBH 0x40000 /* No bufferheads */
384#define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */ 384#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
385#define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ 385#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
386#define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ 386#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
387 387
388/* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ 388/* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */
389#ifndef _LINUX_EXT2_FS_H 389#ifndef _LINUX_EXT2_FS_H
390#define clear_opt(o, opt) o &= ~EXT3_MOUNT_##opt 390#define clear_opt(o, opt) o &= ~EXT4_MOUNT_##opt
391#define set_opt(o, opt) o |= EXT3_MOUNT_##opt 391#define set_opt(o, opt) o |= EXT4_MOUNT_##opt
392#define test_opt(sb, opt) (EXT3_SB(sb)->s_mount_opt & \ 392#define test_opt(sb, opt) (EXT4_SB(sb)->s_mount_opt & \
393 EXT3_MOUNT_##opt) 393 EXT4_MOUNT_##opt)
394#else 394#else
395#define EXT2_MOUNT_NOLOAD EXT3_MOUNT_NOLOAD 395#define EXT2_MOUNT_NOLOAD EXT4_MOUNT_NOLOAD
396#define EXT2_MOUNT_ABORT EXT3_MOUNT_ABORT 396#define EXT2_MOUNT_ABORT EXT4_MOUNT_ABORT
397#define EXT2_MOUNT_DATA_FLAGS EXT3_MOUNT_DATA_FLAGS 397#define EXT2_MOUNT_DATA_FLAGS EXT4_MOUNT_DATA_FLAGS
398#endif 398#endif
399 399
400#define ext3_set_bit ext2_set_bit 400#define ext4_set_bit ext2_set_bit
401#define ext3_set_bit_atomic ext2_set_bit_atomic 401#define ext4_set_bit_atomic ext2_set_bit_atomic
402#define ext3_clear_bit ext2_clear_bit 402#define ext4_clear_bit ext2_clear_bit
403#define ext3_clear_bit_atomic ext2_clear_bit_atomic 403#define ext4_clear_bit_atomic ext2_clear_bit_atomic
404#define ext3_test_bit ext2_test_bit 404#define ext4_test_bit ext2_test_bit
405#define ext3_find_first_zero_bit ext2_find_first_zero_bit 405#define ext4_find_first_zero_bit ext2_find_first_zero_bit
406#define ext3_find_next_zero_bit ext2_find_next_zero_bit 406#define ext4_find_next_zero_bit ext2_find_next_zero_bit
407 407
408/* 408/*
409 * Maximal mount counts between two filesystem checks 409 * Maximal mount counts between two filesystem checks
410 */ 410 */
411#define EXT3_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */ 411#define EXT4_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */
412#define EXT3_DFL_CHECKINTERVAL 0 /* Don't use interval check */ 412#define EXT4_DFL_CHECKINTERVAL 0 /* Don't use interval check */
413 413
414/* 414/*
415 * Behaviour when detecting errors 415 * Behaviour when detecting errors
416 */ 416 */
417#define EXT3_ERRORS_CONTINUE 1 /* Continue execution */ 417#define EXT4_ERRORS_CONTINUE 1 /* Continue execution */
418#define EXT3_ERRORS_RO 2 /* Remount fs read-only */ 418#define EXT4_ERRORS_RO 2 /* Remount fs read-only */
419#define EXT3_ERRORS_PANIC 3 /* Panic */ 419#define EXT4_ERRORS_PANIC 3 /* Panic */
420#define EXT3_ERRORS_DEFAULT EXT3_ERRORS_CONTINUE 420#define EXT4_ERRORS_DEFAULT EXT4_ERRORS_CONTINUE
421 421
422/* 422/*
423 * Structure of the super block 423 * Structure of the super block
424 */ 424 */
425struct ext3_super_block { 425struct ext4_super_block {
426/*00*/ __le32 s_inodes_count; /* Inodes count */ 426/*00*/ __le32 s_inodes_count; /* Inodes count */
427 __le32 s_blocks_count; /* Blocks count */ 427 __le32 s_blocks_count; /* Blocks count */
428 __le32 s_r_blocks_count; /* Reserved blocks count */ 428 __le32 s_r_blocks_count; /* Reserved blocks count */
@@ -449,7 +449,7 @@ struct ext3_super_block {
449/*50*/ __le16 s_def_resuid; /* Default uid for reserved blocks */ 449/*50*/ __le16 s_def_resuid; /* Default uid for reserved blocks */
450 __le16 s_def_resgid; /* Default gid for reserved blocks */ 450 __le16 s_def_resgid; /* Default gid for reserved blocks */
451 /* 451 /*
452 * These fields are for EXT3_DYNAMIC_REV superblocks only. 452 * These fields are for EXT4_DYNAMIC_REV superblocks only.
453 * 453 *
454 * Note: the difference between the compatible feature set and 454 * Note: the difference between the compatible feature set and
455 * the incompatible feature set is that if there is a bit set 455 * the incompatible feature set is that if there is a bit set
@@ -473,13 +473,13 @@ struct ext3_super_block {
473/*C8*/ __le32 s_algorithm_usage_bitmap; /* For compression */ 473/*C8*/ __le32 s_algorithm_usage_bitmap; /* For compression */
474 /* 474 /*
475 * Performance hints. Directory preallocation should only 475 * Performance hints. Directory preallocation should only
476 * happen if the EXT3_FEATURE_COMPAT_DIR_PREALLOC flag is on. 476 * happen if the EXT4_FEATURE_COMPAT_DIR_PREALLOC flag is on.
477 */ 477 */
478 __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ 478 __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
479 __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ 479 __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
480 __le16 s_reserved_gdt_blocks; /* Per group desc for online growth */ 480 __le16 s_reserved_gdt_blocks; /* Per group desc for online growth */
481 /* 481 /*
482 * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set. 482 * Journaling support valid if EXT4_FEATURE_COMPAT_HAS_JOURNAL set.
483 */ 483 */
484/*D0*/ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ 484/*D0*/ __u8 s_journal_uuid[16]; /* uuid of journal superblock */
485/*E0*/ __le32 s_journal_inum; /* inode number of journal file */ 485/*E0*/ __le32 s_journal_inum; /* inode number of journal file */
@@ -495,186 +495,186 @@ struct ext3_super_block {
495}; 495};
496 496
497#ifdef __KERNEL__ 497#ifdef __KERNEL__
498#include <linux/ext3_fs_i.h> 498#include <linux/ext4_fs_i.h>
499#include <linux/ext3_fs_sb.h> 499#include <linux/ext4_fs_sb.h>
500static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb) 500static inline struct ext4_sb_info * EXT4_SB(struct super_block *sb)
501{ 501{
502 return sb->s_fs_info; 502 return sb->s_fs_info;
503} 503}
504static inline struct ext3_inode_info *EXT3_I(struct inode *inode) 504static inline struct ext4_inode_info *EXT4_I(struct inode *inode)
505{ 505{
506 return container_of(inode, struct ext3_inode_info, vfs_inode); 506 return container_of(inode, struct ext4_inode_info, vfs_inode);
507} 507}
508 508
509static inline int ext3_valid_inum(struct super_block *sb, unsigned long ino) 509static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
510{ 510{
511 return ino == EXT3_ROOT_INO || 511 return ino == EXT4_ROOT_INO ||
512 ino == EXT3_JOURNAL_INO || 512 ino == EXT4_JOURNAL_INO ||
513 ino == EXT3_RESIZE_INO || 513 ino == EXT4_RESIZE_INO ||
514 (ino >= EXT3_FIRST_INO(sb) && 514 (ino >= EXT4_FIRST_INO(sb) &&
515 ino <= le32_to_cpu(EXT3_SB(sb)->s_es->s_inodes_count)); 515 ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count));
516} 516}
517#else 517#else
518/* Assume that user mode programs are passing in an ext3fs superblock, not 518/* Assume that user mode programs are passing in an ext4fs superblock, not
519 * a kernel struct super_block. This will allow us to call the feature-test 519 * a kernel struct super_block. This will allow us to call the feature-test
520 * macros from user land. */ 520 * macros from user land. */
521#define EXT3_SB(sb) (sb) 521#define EXT4_SB(sb) (sb)
522#endif 522#endif
523 523
524#define NEXT_ORPHAN(inode) EXT3_I(inode)->i_dtime 524#define NEXT_ORPHAN(inode) EXT4_I(inode)->i_dtime
525 525
526/* 526/*
527 * Codes for operating systems 527 * Codes for operating systems
528 */ 528 */
529#define EXT3_OS_LINUX 0 529#define EXT4_OS_LINUX 0
530#define EXT3_OS_HURD 1 530#define EXT4_OS_HURD 1
531#define EXT3_OS_MASIX 2 531#define EXT4_OS_MASIX 2
532#define EXT3_OS_FREEBSD 3 532#define EXT4_OS_FREEBSD 3
533#define EXT3_OS_LITES 4 533#define EXT4_OS_LITES 4
534 534
535/* 535/*
536 * Revision levels 536 * Revision levels
537 */ 537 */
538#define EXT3_GOOD_OLD_REV 0 /* The good old (original) format */ 538#define EXT4_GOOD_OLD_REV 0 /* The good old (original) format */
539#define EXT3_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ 539#define EXT4_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */
540 540
541#define EXT3_CURRENT_REV EXT3_GOOD_OLD_REV 541#define EXT4_CURRENT_REV EXT4_GOOD_OLD_REV
542#define EXT3_MAX_SUPP_REV EXT3_DYNAMIC_REV 542#define EXT4_MAX_SUPP_REV EXT4_DYNAMIC_REV
543 543
544#define EXT3_GOOD_OLD_INODE_SIZE 128 544#define EXT4_GOOD_OLD_INODE_SIZE 128
545 545
546/* 546/*
547 * Feature set definitions 547 * Feature set definitions
548 */ 548 */
549 549
550#define EXT3_HAS_COMPAT_FEATURE(sb,mask) \ 550#define EXT4_HAS_COMPAT_FEATURE(sb,mask) \
551 ( EXT3_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) ) 551 ( EXT4_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) )
552#define EXT3_HAS_RO_COMPAT_FEATURE(sb,mask) \ 552#define EXT4_HAS_RO_COMPAT_FEATURE(sb,mask) \
553 ( EXT3_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) ) 553 ( EXT4_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) )
554#define EXT3_HAS_INCOMPAT_FEATURE(sb,mask) \ 554#define EXT4_HAS_INCOMPAT_FEATURE(sb,mask) \
555 ( EXT3_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) ) 555 ( EXT4_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) )
556#define EXT3_SET_COMPAT_FEATURE(sb,mask) \ 556#define EXT4_SET_COMPAT_FEATURE(sb,mask) \
557 EXT3_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask) 557 EXT4_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask)
558#define EXT3_SET_RO_COMPAT_FEATURE(sb,mask) \ 558#define EXT4_SET_RO_COMPAT_FEATURE(sb,mask) \
559 EXT3_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask) 559 EXT4_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask)
560#define EXT3_SET_INCOMPAT_FEATURE(sb,mask) \ 560#define EXT4_SET_INCOMPAT_FEATURE(sb,mask) \
561 EXT3_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask) 561 EXT4_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask)
562#define EXT3_CLEAR_COMPAT_FEATURE(sb,mask) \ 562#define EXT4_CLEAR_COMPAT_FEATURE(sb,mask) \
563 EXT3_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask) 563 EXT4_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask)
564#define EXT3_CLEAR_RO_COMPAT_FEATURE(sb,mask) \ 564#define EXT4_CLEAR_RO_COMPAT_FEATURE(sb,mask) \
565 EXT3_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask) 565 EXT4_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask)
566#define EXT3_CLEAR_INCOMPAT_FEATURE(sb,mask) \ 566#define EXT4_CLEAR_INCOMPAT_FEATURE(sb,mask) \
567 EXT3_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask) 567 EXT4_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask)
568 568
569#define EXT3_FEATURE_COMPAT_DIR_PREALLOC 0x0001 569#define EXT4_FEATURE_COMPAT_DIR_PREALLOC 0x0001
570#define EXT3_FEATURE_COMPAT_IMAGIC_INODES 0x0002 570#define EXT4_FEATURE_COMPAT_IMAGIC_INODES 0x0002
571#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 571#define EXT4_FEATURE_COMPAT_HAS_JOURNAL 0x0004
572#define EXT3_FEATURE_COMPAT_EXT_ATTR 0x0008 572#define EXT4_FEATURE_COMPAT_EXT_ATTR 0x0008
573#define EXT3_FEATURE_COMPAT_RESIZE_INODE 0x0010 573#define EXT4_FEATURE_COMPAT_RESIZE_INODE 0x0010
574#define EXT3_FEATURE_COMPAT_DIR_INDEX 0x0020 574#define EXT4_FEATURE_COMPAT_DIR_INDEX 0x0020
575 575
576#define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 576#define EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
577#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 577#define EXT4_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
578#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 578#define EXT4_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
579 579
580#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001 580#define EXT4_FEATURE_INCOMPAT_COMPRESSION 0x0001
581#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 581#define EXT4_FEATURE_INCOMPAT_FILETYPE 0x0002
582#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */ 582#define EXT4_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */
583#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */ 583#define EXT4_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */
584#define EXT3_FEATURE_INCOMPAT_META_BG 0x0010 584#define EXT4_FEATURE_INCOMPAT_META_BG 0x0010
585 585
586#define EXT3_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR 586#define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
587#define EXT3_FEATURE_INCOMPAT_SUPP (EXT3_FEATURE_INCOMPAT_FILETYPE| \ 587#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \
588 EXT3_FEATURE_INCOMPAT_RECOVER| \ 588 EXT4_FEATURE_INCOMPAT_RECOVER| \
589 EXT3_FEATURE_INCOMPAT_META_BG) 589 EXT4_FEATURE_INCOMPAT_META_BG)
590#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ 590#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
591 EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ 591 EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
592 EXT3_FEATURE_RO_COMPAT_BTREE_DIR) 592 EXT4_FEATURE_RO_COMPAT_BTREE_DIR)
593 593
594/* 594/*
595 * Default values for user and/or group using reserved blocks 595 * Default values for user and/or group using reserved blocks
596 */ 596 */
597#define EXT3_DEF_RESUID 0 597#define EXT4_DEF_RESUID 0
598#define EXT3_DEF_RESGID 0 598#define EXT4_DEF_RESGID 0
599 599
600/* 600/*
601 * Default mount options 601 * Default mount options
602 */ 602 */
603#define EXT3_DEFM_DEBUG 0x0001 603#define EXT4_DEFM_DEBUG 0x0001
604#define EXT3_DEFM_BSDGROUPS 0x0002 604#define EXT4_DEFM_BSDGROUPS 0x0002
605#define EXT3_DEFM_XATTR_USER 0x0004 605#define EXT4_DEFM_XATTR_USER 0x0004
606#define EXT3_DEFM_ACL 0x0008 606#define EXT4_DEFM_ACL 0x0008
607#define EXT3_DEFM_UID16 0x0010 607#define EXT4_DEFM_UID16 0x0010
608#define EXT3_DEFM_JMODE 0x0060 608#define EXT4_DEFM_JMODE 0x0060
609#define EXT3_DEFM_JMODE_DATA 0x0020 609#define EXT4_DEFM_JMODE_DATA 0x0020
610#define EXT3_DEFM_JMODE_ORDERED 0x0040 610#define EXT4_DEFM_JMODE_ORDERED 0x0040
611#define EXT3_DEFM_JMODE_WBACK 0x0060 611#define EXT4_DEFM_JMODE_WBACK 0x0060
612 612
613/* 613/*
614 * Structure of a directory entry 614 * Structure of a directory entry
615 */ 615 */
616#define EXT3_NAME_LEN 255 616#define EXT4_NAME_LEN 255
617 617
618struct ext3_dir_entry { 618struct ext4_dir_entry {
619 __le32 inode; /* Inode number */ 619 __le32 inode; /* Inode number */
620 __le16 rec_len; /* Directory entry length */ 620 __le16 rec_len; /* Directory entry length */
621 __le16 name_len; /* Name length */ 621 __le16 name_len; /* Name length */
622 char name[EXT3_NAME_LEN]; /* File name */ 622 char name[EXT4_NAME_LEN]; /* File name */
623}; 623};
624 624
625/* 625/*
626 * The new version of the directory entry. Since EXT3 structures are 626 * The new version of the directory entry. Since EXT4 structures are
627 * stored in intel byte order, and the name_len field could never be 627 * stored in intel byte order, and the name_len field could never be
628 * bigger than 255 chars, it's safe to reclaim the extra byte for the 628 * bigger than 255 chars, it's safe to reclaim the extra byte for the
629 * file_type field. 629 * file_type field.
630 */ 630 */
631struct ext3_dir_entry_2 { 631struct ext4_dir_entry_2 {
632 __le32 inode; /* Inode number */ 632 __le32 inode; /* Inode number */
633 __le16 rec_len; /* Directory entry length */ 633 __le16 rec_len; /* Directory entry length */
634 __u8 name_len; /* Name length */ 634 __u8 name_len; /* Name length */
635 __u8 file_type; 635 __u8 file_type;
636 char name[EXT3_NAME_LEN]; /* File name */ 636 char name[EXT4_NAME_LEN]; /* File name */
637}; 637};
638 638
639/* 639/*
640 * Ext3 directory file types. Only the low 3 bits are used. The 640 * Ext4 directory file types. Only the low 3 bits are used. The
641 * other bits are reserved for now. 641 * other bits are reserved for now.
642 */ 642 */
643#define EXT3_FT_UNKNOWN 0 643#define EXT4_FT_UNKNOWN 0
644#define EXT3_FT_REG_FILE 1 644#define EXT4_FT_REG_FILE 1
645#define EXT3_FT_DIR 2 645#define EXT4_FT_DIR 2
646#define EXT3_FT_CHRDEV 3 646#define EXT4_FT_CHRDEV 3
647#define EXT3_FT_BLKDEV 4 647#define EXT4_FT_BLKDEV 4
648#define EXT3_FT_FIFO 5 648#define EXT4_FT_FIFO 5
649#define EXT3_FT_SOCK 6 649#define EXT4_FT_SOCK 6
650#define EXT3_FT_SYMLINK 7 650#define EXT4_FT_SYMLINK 7
651 651
652#define EXT3_FT_MAX 8 652#define EXT4_FT_MAX 8
653 653
654/* 654/*
655 * EXT3_DIR_PAD defines the directory entries boundaries 655 * EXT4_DIR_PAD defines the directory entries boundaries
656 * 656 *
657 * NOTE: It must be a multiple of 4 657 * NOTE: It must be a multiple of 4
658 */ 658 */
659#define EXT3_DIR_PAD 4 659#define EXT4_DIR_PAD 4
660#define EXT3_DIR_ROUND (EXT3_DIR_PAD - 1) 660#define EXT4_DIR_ROUND (EXT4_DIR_PAD - 1)
661#define EXT3_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT3_DIR_ROUND) & \ 661#define EXT4_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT4_DIR_ROUND) & \
662 ~EXT3_DIR_ROUND) 662 ~EXT4_DIR_ROUND)
663/* 663/*
664 * Hash Tree Directory indexing 664 * Hash Tree Directory indexing
665 * (c) Daniel Phillips, 2001 665 * (c) Daniel Phillips, 2001
666 */ 666 */
667 667
668#ifdef CONFIG_EXT3_INDEX 668#ifdef CONFIG_EXT4_INDEX
669 #define is_dx(dir) (EXT3_HAS_COMPAT_FEATURE(dir->i_sb, \ 669 #define is_dx(dir) (EXT4_HAS_COMPAT_FEATURE(dir->i_sb, \
670 EXT3_FEATURE_COMPAT_DIR_INDEX) && \ 670 EXT4_FEATURE_COMPAT_DIR_INDEX) && \
671 (EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) 671 (EXT4_I(dir)->i_flags & EXT4_INDEX_FL))
672#define EXT3_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT3_LINK_MAX) 672#define EXT4_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT4_LINK_MAX)
673#define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 || (dir)->i_nlink == 1) 673#define EXT4_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 || (dir)->i_nlink == 1)
674#else 674#else
675 #define is_dx(dir) 0 675 #define is_dx(dir) 0
676#define EXT3_DIR_LINK_MAX(dir) ((dir)->i_nlink >= EXT3_LINK_MAX) 676#define EXT4_DIR_LINK_MAX(dir) ((dir)->i_nlink >= EXT4_LINK_MAX)
677#define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2) 677#define EXT4_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2)
678#endif 678#endif
679 679
680/* Legal values for the dx_root hash_version field: */ 680/* Legal values for the dx_root hash_version field: */
@@ -694,10 +694,10 @@ struct dx_hash_info
694 u32 *seed; 694 u32 *seed;
695}; 695};
696 696
697#define EXT3_HTREE_EOF 0x7fffffff 697#define EXT4_HTREE_EOF 0x7fffffff
698 698
699/* 699/*
700 * Control parameters used by ext3_htree_next_block 700 * Control parameters used by ext4_htree_next_block
701 */ 701 */
702#define HASH_NB_ALWAYS 1 702#define HASH_NB_ALWAYS 1
703 703
@@ -705,16 +705,16 @@ struct dx_hash_info
705/* 705/*
706 * Describe an inode's exact location on disk and in memory 706 * Describe an inode's exact location on disk and in memory
707 */ 707 */
708struct ext3_iloc 708struct ext4_iloc
709{ 709{
710 struct buffer_head *bh; 710 struct buffer_head *bh;
711 unsigned long offset; 711 unsigned long offset;
712 unsigned long block_group; 712 unsigned long block_group;
713}; 713};
714 714
715static inline struct ext3_inode *ext3_raw_inode(struct ext3_iloc *iloc) 715static inline struct ext4_inode *ext4_raw_inode(struct ext4_iloc *iloc)
716{ 716{
717 return (struct ext3_inode *) (iloc->bh->b_data + iloc->offset); 717 return (struct ext4_inode *) (iloc->bh->b_data + iloc->offset);
718} 718}
719 719
720/* 720/*
@@ -733,11 +733,11 @@ struct dir_private_info {
733}; 733};
734 734
735/* calculate the first block number of the group */ 735/* calculate the first block number of the group */
736static inline ext3_fsblk_t 736static inline ext4_fsblk_t
737ext3_group_first_block_no(struct super_block *sb, unsigned long group_no) 737ext4_group_first_block_no(struct super_block *sb, unsigned long group_no)
738{ 738{
739 return group_no * (ext3_fsblk_t)EXT3_BLOCKS_PER_GROUP(sb) + 739 return group_no * (ext4_fsblk_t)EXT4_BLOCKS_PER_GROUP(sb) +
740 le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block); 740 le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block);
741} 741}
742 742
743/* 743/*
@@ -751,113 +751,113 @@ ext3_group_first_block_no(struct super_block *sb, unsigned long group_no)
751 751
752/* 752/*
753 * Ok, these declarations are also in <linux/kernel.h> but none of the 753 * Ok, these declarations are also in <linux/kernel.h> but none of the
754 * ext3 source programs needs to include it so they are duplicated here. 754 * ext4 source programs needs to include it so they are duplicated here.
755 */ 755 */
756# define NORET_TYPE /**/ 756# define NORET_TYPE /**/
757# define ATTRIB_NORET __attribute__((noreturn)) 757# define ATTRIB_NORET __attribute__((noreturn))
758# define NORET_AND noreturn, 758# define NORET_AND noreturn,
759 759
760/* balloc.c */ 760/* balloc.c */
761extern int ext3_bg_has_super(struct super_block *sb, int group); 761extern int ext4_bg_has_super(struct super_block *sb, int group);
762extern unsigned long ext3_bg_num_gdb(struct super_block *sb, int group); 762extern unsigned long ext4_bg_num_gdb(struct super_block *sb, int group);
763extern ext3_fsblk_t ext3_new_block (handle_t *handle, struct inode *inode, 763extern ext4_fsblk_t ext4_new_block (handle_t *handle, struct inode *inode,
764 ext3_fsblk_t goal, int *errp); 764 ext4_fsblk_t goal, int *errp);
765extern ext3_fsblk_t ext3_new_blocks (handle_t *handle, struct inode *inode, 765extern ext4_fsblk_t ext4_new_blocks (handle_t *handle, struct inode *inode,
766 ext3_fsblk_t goal, unsigned long *count, int *errp); 766 ext4_fsblk_t goal, unsigned long *count, int *errp);
767extern void ext3_free_blocks (handle_t *handle, struct inode *inode, 767extern void ext4_free_blocks (handle_t *handle, struct inode *inode,
768 ext3_fsblk_t block, unsigned long count); 768 ext4_fsblk_t block, unsigned long count);
769extern void ext3_free_blocks_sb (handle_t *handle, struct super_block *sb, 769extern void ext4_free_blocks_sb (handle_t *handle, struct super_block *sb,
770 ext3_fsblk_t block, unsigned long count, 770 ext4_fsblk_t block, unsigned long count,
771 unsigned long *pdquot_freed_blocks); 771 unsigned long *pdquot_freed_blocks);
772extern ext3_fsblk_t ext3_count_free_blocks (struct super_block *); 772extern ext4_fsblk_t ext4_count_free_blocks (struct super_block *);
773extern void ext3_check_blocks_bitmap (struct super_block *); 773extern void ext4_check_blocks_bitmap (struct super_block *);
774extern struct ext3_group_desc * ext3_get_group_desc(struct super_block * sb, 774extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
775 unsigned int block_group, 775 unsigned int block_group,
776 struct buffer_head ** bh); 776 struct buffer_head ** bh);
777extern int ext3_should_retry_alloc(struct super_block *sb, int *retries); 777extern int ext4_should_retry_alloc(struct super_block *sb, int *retries);
778extern void ext3_init_block_alloc_info(struct inode *); 778extern void ext4_init_block_alloc_info(struct inode *);
779extern void ext3_rsv_window_add(struct super_block *sb, struct ext3_reserve_window_node *rsv); 779extern void ext4_rsv_window_add(struct super_block *sb, struct ext4_reserve_window_node *rsv);
780 780
781/* dir.c */ 781/* dir.c */
782extern int ext3_check_dir_entry(const char *, struct inode *, 782extern int ext4_check_dir_entry(const char *, struct inode *,
783 struct ext3_dir_entry_2 *, 783 struct ext4_dir_entry_2 *,
784 struct buffer_head *, unsigned long); 784 struct buffer_head *, unsigned long);
785extern int ext3_htree_store_dirent(struct file *dir_file, __u32 hash, 785extern int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,
786 __u32 minor_hash, 786 __u32 minor_hash,
787 struct ext3_dir_entry_2 *dirent); 787 struct ext4_dir_entry_2 *dirent);
788extern void ext3_htree_free_dir_info(struct dir_private_info *p); 788extern void ext4_htree_free_dir_info(struct dir_private_info *p);
789 789
790/* fsync.c */ 790/* fsync.c */
791extern int ext3_sync_file (struct file *, struct dentry *, int); 791extern int ext4_sync_file (struct file *, struct dentry *, int);
792 792
793/* hash.c */ 793/* hash.c */
794extern int ext3fs_dirhash(const char *name, int len, struct 794extern int ext4fs_dirhash(const char *name, int len, struct
795 dx_hash_info *hinfo); 795 dx_hash_info *hinfo);
796 796
797/* ialloc.c */ 797/* ialloc.c */
798extern struct inode * ext3_new_inode (handle_t *, struct inode *, int); 798extern struct inode * ext4_new_inode (handle_t *, struct inode *, int);
799extern void ext3_free_inode (handle_t *, struct inode *); 799extern void ext4_free_inode (handle_t *, struct inode *);
800extern struct inode * ext3_orphan_get (struct super_block *, unsigned long); 800extern struct inode * ext4_orphan_get (struct super_block *, unsigned long);
801extern unsigned long ext3_count_free_inodes (struct super_block *); 801extern unsigned long ext4_count_free_inodes (struct super_block *);
802extern unsigned long ext3_count_dirs (struct super_block *); 802extern unsigned long ext4_count_dirs (struct super_block *);
803extern void ext3_check_inodes_bitmap (struct super_block *); 803extern void ext4_check_inodes_bitmap (struct super_block *);
804extern unsigned long ext3_count_free (struct buffer_head *, unsigned); 804extern unsigned long ext4_count_free (struct buffer_head *, unsigned);
805 805
806 806
807/* inode.c */ 807/* inode.c */
808int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode, 808int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode,
809 struct buffer_head *bh, ext3_fsblk_t blocknr); 809 struct buffer_head *bh, ext4_fsblk_t blocknr);
810struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *); 810struct buffer_head * ext4_getblk (handle_t *, struct inode *, long, int, int *);
811struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *); 811struct buffer_head * ext4_bread (handle_t *, struct inode *, int, int, int *);
812int ext3_get_blocks_handle(handle_t *handle, struct inode *inode, 812int ext4_get_blocks_handle(handle_t *handle, struct inode *inode,
813 sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result, 813 sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result,
814 int create, int extend_disksize); 814 int create, int extend_disksize);
815 815
816extern void ext3_read_inode (struct inode *); 816extern void ext4_read_inode (struct inode *);
817extern int ext3_write_inode (struct inode *, int); 817extern int ext4_write_inode (struct inode *, int);
818extern int ext3_setattr (struct dentry *, struct iattr *); 818extern int ext4_setattr (struct dentry *, struct iattr *);
819extern void ext3_delete_inode (struct inode *); 819extern void ext4_delete_inode (struct inode *);
820extern int ext3_sync_inode (handle_t *, struct inode *); 820extern int ext4_sync_inode (handle_t *, struct inode *);
821extern void ext3_discard_reservation (struct inode *); 821extern void ext4_discard_reservation (struct inode *);
822extern void ext3_dirty_inode(struct inode *); 822extern void ext4_dirty_inode(struct inode *);
823extern int ext3_change_inode_journal_flag(struct inode *, int); 823extern int ext4_change_inode_journal_flag(struct inode *, int);
824extern int ext3_get_inode_loc(struct inode *, struct ext3_iloc *); 824extern int ext4_get_inode_loc(struct inode *, struct ext4_iloc *);
825extern void ext3_truncate (struct inode *); 825extern void ext4_truncate (struct inode *);
826extern void ext3_set_inode_flags(struct inode *); 826extern void ext4_set_inode_flags(struct inode *);
827extern void ext3_set_aops(struct inode *inode); 827extern void ext4_set_aops(struct inode *inode);
828 828
829/* ioctl.c */ 829/* ioctl.c */
830extern int ext3_ioctl (struct inode *, struct file *, unsigned int, 830extern int ext4_ioctl (struct inode *, struct file *, unsigned int,
831 unsigned long); 831 unsigned long);
832extern long ext3_compat_ioctl (struct file *, unsigned int, unsigned long); 832extern long ext4_compat_ioctl (struct file *, unsigned int, unsigned long);
833 833
834/* namei.c */ 834/* namei.c */
835extern int ext3_orphan_add(handle_t *, struct inode *); 835extern int ext4_orphan_add(handle_t *, struct inode *);
836extern int ext3_orphan_del(handle_t *, struct inode *); 836extern int ext4_orphan_del(handle_t *, struct inode *);
837extern int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash, 837extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
838 __u32 start_minor_hash, __u32 *next_hash); 838 __u32 start_minor_hash, __u32 *next_hash);
839 839
840/* resize.c */ 840/* resize.c */
841extern int ext3_group_add(struct super_block *sb, 841extern int ext4_group_add(struct super_block *sb,
842 struct ext3_new_group_data *input); 842 struct ext4_new_group_data *input);
843extern int ext3_group_extend(struct super_block *sb, 843extern int ext4_group_extend(struct super_block *sb,
844 struct ext3_super_block *es, 844 struct ext4_super_block *es,
845 ext3_fsblk_t n_blocks_count); 845 ext4_fsblk_t n_blocks_count);
846 846
847/* super.c */ 847/* super.c */
848extern void ext3_error (struct super_block *, const char *, const char *, ...) 848extern void ext4_error (struct super_block *, const char *, const char *, ...)
849 __attribute__ ((format (printf, 3, 4))); 849 __attribute__ ((format (printf, 3, 4)));
850extern void __ext3_std_error (struct super_block *, const char *, int); 850extern void __ext4_std_error (struct super_block *, const char *, int);
851extern void ext3_abort (struct super_block *, const char *, const char *, ...) 851extern void ext4_abort (struct super_block *, const char *, const char *, ...)
852 __attribute__ ((format (printf, 3, 4))); 852 __attribute__ ((format (printf, 3, 4)));
853extern void ext3_warning (struct super_block *, const char *, const char *, ...) 853extern void ext4_warning (struct super_block *, const char *, const char *, ...)
854 __attribute__ ((format (printf, 3, 4))); 854 __attribute__ ((format (printf, 3, 4)));
855extern void ext3_update_dynamic_rev (struct super_block *sb); 855extern void ext4_update_dynamic_rev (struct super_block *sb);
856 856
857#define ext3_std_error(sb, errno) \ 857#define ext4_std_error(sb, errno) \
858do { \ 858do { \
859 if ((errno)) \ 859 if ((errno)) \
860 __ext3_std_error((sb), __FUNCTION__, (errno)); \ 860 __ext4_std_error((sb), __FUNCTION__, (errno)); \
861} while (0) 861} while (0)
862 862
863/* 863/*
@@ -865,21 +865,21 @@ do { \
865 */ 865 */
866 866
867/* dir.c */ 867/* dir.c */
868extern const struct file_operations ext3_dir_operations; 868extern const struct file_operations ext4_dir_operations;
869 869
870/* file.c */ 870/* file.c */
871extern struct inode_operations ext3_file_inode_operations; 871extern struct inode_operations ext4_file_inode_operations;
872extern const struct file_operations ext3_file_operations; 872extern const struct file_operations ext4_file_operations;
873 873
874/* namei.c */ 874/* namei.c */
875extern struct inode_operations ext3_dir_inode_operations; 875extern struct inode_operations ext4_dir_inode_operations;
876extern struct inode_operations ext3_special_inode_operations; 876extern struct inode_operations ext4_special_inode_operations;
877 877
878/* symlink.c */ 878/* symlink.c */
879extern struct inode_operations ext3_symlink_inode_operations; 879extern struct inode_operations ext4_symlink_inode_operations;
880extern struct inode_operations ext3_fast_symlink_inode_operations; 880extern struct inode_operations ext4_fast_symlink_inode_operations;
881 881
882 882
883#endif /* __KERNEL__ */ 883#endif /* __KERNEL__ */
884 884
885#endif /* _LINUX_EXT3_FS_H */ 885#endif /* _LINUX_EXT4_FS_H */
diff --git a/include/linux/ext4_fs_i.h b/include/linux/ext4_fs_i.h
index 4395e5206746..18a6ce98537f 100644
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/ext3_fs_i.h 2 * linux/include/linux/ext4_fs_i.h
3 * 3 *
4 * Copyright (C) 1992, 1993, 1994, 1995 4 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr) 5 * Remy Card (card@masi.ibp.fr)
@@ -13,8 +13,8 @@
13 * Copyright (C) 1991, 1992 Linus Torvalds 13 * Copyright (C) 1991, 1992 Linus Torvalds
14 */ 14 */
15 15
16#ifndef _LINUX_EXT3_FS_I 16#ifndef _LINUX_EXT4_FS_I
17#define _LINUX_EXT3_FS_I 17#define _LINUX_EXT4_FS_I
18 18
19#include <linux/rwsem.h> 19#include <linux/rwsem.h>
20#include <linux/rbtree.h> 20#include <linux/rbtree.h>
@@ -22,43 +22,43 @@
22#include <linux/mutex.h> 22#include <linux/mutex.h>
23 23
24/* data type for block offset of block group */ 24/* data type for block offset of block group */
25typedef int ext3_grpblk_t; 25typedef int ext4_grpblk_t;
26 26
27/* data type for filesystem-wide blocks number */ 27/* data type for filesystem-wide blocks number */
28typedef unsigned long ext3_fsblk_t; 28typedef unsigned long ext4_fsblk_t;
29 29
30#define E3FSBLK "%lu" 30#define E3FSBLK "%lu"
31 31
32struct ext3_reserve_window { 32struct ext4_reserve_window {
33 ext3_fsblk_t _rsv_start; /* First byte reserved */ 33 ext4_fsblk_t _rsv_start; /* First byte reserved */
34 ext3_fsblk_t _rsv_end; /* Last byte reserved or 0 */ 34 ext4_fsblk_t _rsv_end; /* Last byte reserved or 0 */
35}; 35};
36 36
37struct ext3_reserve_window_node { 37struct ext4_reserve_window_node {
38 struct rb_node rsv_node; 38 struct rb_node rsv_node;
39 __u32 rsv_goal_size; 39 __u32 rsv_goal_size;
40 __u32 rsv_alloc_hit; 40 __u32 rsv_alloc_hit;
41 struct ext3_reserve_window rsv_window; 41 struct ext4_reserve_window rsv_window;
42}; 42};
43 43
44struct ext3_block_alloc_info { 44struct ext4_block_alloc_info {
45 /* information about reservation window */ 45 /* information about reservation window */
46 struct ext3_reserve_window_node rsv_window_node; 46 struct ext4_reserve_window_node rsv_window_node;
47 /* 47 /*
48 * was i_next_alloc_block in ext3_inode_info 48 * was i_next_alloc_block in ext4_inode_info
49 * is the logical (file-relative) number of the 49 * is the logical (file-relative) number of the
50 * most-recently-allocated block in this file. 50 * most-recently-allocated block in this file.
51 * We use this for detecting linearly ascending allocation requests. 51 * We use this for detecting linearly ascending allocation requests.
52 */ 52 */
53 __u32 last_alloc_logical_block; 53 __u32 last_alloc_logical_block;
54 /* 54 /*
55 * Was i_next_alloc_goal in ext3_inode_info 55 * Was i_next_alloc_goal in ext4_inode_info
56 * is the *physical* companion to i_next_alloc_block. 56 * is the *physical* companion to i_next_alloc_block.
57 * it the the physical block number of the block which was most-recentl 57 * it the the physical block number of the block which was most-recentl
58 * allocated to this file. This give us the goal (target) for the next 58 * allocated to this file. This give us the goal (target) for the next
59 * allocation when we detect linearly ascending requests. 59 * allocation when we detect linearly ascending requests.
60 */ 60 */
61 ext3_fsblk_t last_alloc_physical_block; 61 ext4_fsblk_t last_alloc_physical_block;
62}; 62};
63 63
64#define rsv_start rsv_window._rsv_start 64#define rsv_start rsv_window._rsv_start
@@ -67,15 +67,15 @@ struct ext3_block_alloc_info {
67/* 67/*
68 * third extended file system inode data in memory 68 * third extended file system inode data in memory
69 */ 69 */
70struct ext3_inode_info { 70struct ext4_inode_info {
71 __le32 i_data[15]; /* unconverted */ 71 __le32 i_data[15]; /* unconverted */
72 __u32 i_flags; 72 __u32 i_flags;
73#ifdef EXT3_FRAGMENTS 73#ifdef EXT4_FRAGMENTS
74 __u32 i_faddr; 74 __u32 i_faddr;
75 __u8 i_frag_no; 75 __u8 i_frag_no;
76 __u8 i_frag_size; 76 __u8 i_frag_size;
77#endif 77#endif
78 ext3_fsblk_t i_file_acl; 78 ext4_fsblk_t i_file_acl;
79 __u32 i_dir_acl; 79 __u32 i_dir_acl;
80 __u32 i_dtime; 80 __u32 i_dtime;
81 81
@@ -87,13 +87,13 @@ struct ext3_inode_info {
87 * near to their parent directory's inode. 87 * near to their parent directory's inode.
88 */ 88 */
89 __u32 i_block_group; 89 __u32 i_block_group;
90 __u32 i_state; /* Dynamic state flags for ext3 */ 90 __u32 i_state; /* Dynamic state flags for ext4 */
91 91
92 /* block reservation info */ 92 /* block reservation info */
93 struct ext3_block_alloc_info *i_block_alloc_info; 93 struct ext4_block_alloc_info *i_block_alloc_info;
94 94
95 __u32 i_dir_start_lookup; 95 __u32 i_dir_start_lookup;
96#ifdef CONFIG_EXT3_FS_XATTR 96#ifdef CONFIG_EXT4DEV_FS_XATTR
97 /* 97 /*
98 * Extended attributes can be read independently of the main file 98 * Extended attributes can be read independently of the main file
99 * data. Taking i_mutex even when reading would cause contention 99 * data. Taking i_mutex even when reading would cause contention
@@ -103,7 +103,7 @@ struct ext3_inode_info {
103 */ 103 */
104 struct rw_semaphore xattr_sem; 104 struct rw_semaphore xattr_sem;
105#endif 105#endif
106#ifdef CONFIG_EXT3_FS_POSIX_ACL 106#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
107 struct posix_acl *i_acl; 107 struct posix_acl *i_acl;
108 struct posix_acl *i_default_acl; 108 struct posix_acl *i_default_acl;
109#endif 109#endif
@@ -113,7 +113,7 @@ struct ext3_inode_info {
113 /* 113 /*
114 * i_disksize keeps track of what the inode size is ON DISK, not 114 * i_disksize keeps track of what the inode size is ON DISK, not
115 * in memory. During truncate, i_size is set to the new size by 115 * in memory. During truncate, i_size is set to the new size by
116 * the VFS prior to calling ext3_truncate(), but the filesystem won't 116 * the VFS prior to calling ext4_truncate(), but the filesystem won't
117 * set i_disksize to 0 until the truncate is actually under way. 117 * set i_disksize to 0 until the truncate is actually under way.
118 * 118 *
119 * The intent is that i_disksize always represents the blocks which 119 * The intent is that i_disksize always represents the blocks which
@@ -123,7 +123,7 @@ struct ext3_inode_info {
123 * 123 *
124 * The only time when i_disksize and i_size may be different is when 124 * The only time when i_disksize and i_size may be different is when
125 * a truncate is in progress. The only things which change i_disksize 125 * a truncate is in progress. The only things which change i_disksize
126 * are ext3_get_block (growth) and ext3_truncate (shrinkth). 126 * are ext4_get_block (growth) and ext4_truncate (shrinkth).
127 */ 127 */
128 loff_t i_disksize; 128 loff_t i_disksize;
129 129
@@ -131,10 +131,10 @@ struct ext3_inode_info {
131 __u16 i_extra_isize; 131 __u16 i_extra_isize;
132 132
133 /* 133 /*
134 * truncate_mutex is for serialising ext3_truncate() against 134 * truncate_mutex is for serialising ext4_truncate() against
135 * ext3_getblock(). In the 2.4 ext2 design, great chunks of inode's 135 * ext4_getblock(). In the 2.4 ext2 design, great chunks of inode's
136 * data tree are chopped off during truncate. We can't do that in 136 * data tree are chopped off during truncate. We can't do that in
137 * ext3 because whenever we perform intermediate commits during 137 * ext4 because whenever we perform intermediate commits during
138 * truncate, the inode and all the metadata blocks *must* be in a 138 * truncate, the inode and all the metadata blocks *must* be in a
139 * consistent state which allows truncation of the orphans to restart 139 * consistent state which allows truncation of the orphans to restart
140 * during recovery. Hence we must fix the get_block-vs-truncate race 140 * during recovery. Hence we must fix the get_block-vs-truncate race
@@ -144,4 +144,4 @@ struct ext3_inode_info {
144 struct inode vfs_inode; 144 struct inode vfs_inode;
145}; 145};
146 146
147#endif /* _LINUX_EXT3_FS_I */ 147#endif /* _LINUX_EXT4_FS_I */
diff --git a/include/linux/ext4_fs_sb.h b/include/linux/ext4_fs_sb.h
index f61309c81cc4..ce4856d70100 100644
--- a/include/linux/ext4_fs_sb.h
+++ b/include/linux/ext4_fs_sb.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/ext3_fs_sb.h 2 * linux/include/linux/ext4_fs_sb.h
3 * 3 *
4 * Copyright (C) 1992, 1993, 1994, 1995 4 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr) 5 * Remy Card (card@masi.ibp.fr)
@@ -13,8 +13,8 @@
13 * Copyright (C) 1991, 1992 Linus Torvalds 13 * Copyright (C) 1991, 1992 Linus Torvalds
14 */ 14 */
15 15
16#ifndef _LINUX_EXT3_FS_SB 16#ifndef _LINUX_EXT4_FS_SB
17#define _LINUX_EXT3_FS_SB 17#define _LINUX_EXT4_FS_SB
18 18
19#ifdef __KERNEL__ 19#ifdef __KERNEL__
20#include <linux/timer.h> 20#include <linux/timer.h>
@@ -27,7 +27,7 @@
27/* 27/*
28 * third extended-fs super-block data in memory 28 * third extended-fs super-block data in memory
29 */ 29 */
30struct ext3_sb_info { 30struct ext4_sb_info {
31 unsigned long s_frag_size; /* Size of a fragment in bytes */ 31 unsigned long s_frag_size; /* Size of a fragment in bytes */
32 unsigned long s_frags_per_block;/* Number of fragments per block */ 32 unsigned long s_frags_per_block;/* Number of fragments per block */
33 unsigned long s_inodes_per_block;/* Number of inodes per block */ 33 unsigned long s_inodes_per_block;/* Number of inodes per block */
@@ -39,7 +39,7 @@ struct ext3_sb_info {
39 unsigned long s_desc_per_block; /* Number of group descriptors per block */ 39 unsigned long s_desc_per_block; /* Number of group descriptors per block */
40 unsigned long s_groups_count; /* Number of groups in the fs */ 40 unsigned long s_groups_count; /* Number of groups in the fs */
41 struct buffer_head * s_sbh; /* Buffer containing the super block */ 41 struct buffer_head * s_sbh; /* Buffer containing the super block */
42 struct ext3_super_block * s_es; /* Pointer to the super block in the buffer */ 42 struct ext4_super_block * s_es; /* Pointer to the super block in the buffer */
43 struct buffer_head ** s_group_desc; 43 struct buffer_head ** s_group_desc;
44 unsigned long s_mount_opt; 44 unsigned long s_mount_opt;
45 uid_t s_resuid; 45 uid_t s_resuid;
@@ -62,7 +62,7 @@ struct ext3_sb_info {
62 /* root of the per fs reservation window tree */ 62 /* root of the per fs reservation window tree */
63 spinlock_t s_rsv_window_lock; 63 spinlock_t s_rsv_window_lock;
64 struct rb_root s_rsv_window_root; 64 struct rb_root s_rsv_window_root;
65 struct ext3_reserve_window_node s_rsv_window_head; 65 struct ext4_reserve_window_node s_rsv_window_head;
66 66
67 /* Journaling */ 67 /* Journaling */
68 struct inode * s_journal_inode; 68 struct inode * s_journal_inode;
@@ -80,4 +80,4 @@ struct ext3_sb_info {
80#endif 80#endif
81}; 81};
82 82
83#endif /* _LINUX_EXT3_FS_SB */ 83#endif /* _LINUX_EXT4_FS_SB */
diff --git a/include/linux/ext4_jbd.h b/include/linux/ext4_jbd.h
index ce0e6109aff0..3dbf6c779037 100644
--- a/include/linux/ext4_jbd.h
+++ b/include/linux/ext4_jbd.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/ext3_jbd.h 2 * linux/include/linux/ext4_jbd.h
3 * 3 *
4 * Written by Stephen C. Tweedie <sct@redhat.com>, 1999 4 * Written by Stephen C. Tweedie <sct@redhat.com>, 1999
5 * 5 *
@@ -9,17 +9,17 @@
9 * the terms of the GNU General Public License, version 2, or at your 9 * the terms of the GNU General Public License, version 2, or at your
10 * option, any later version, incorporated herein by reference. 10 * option, any later version, incorporated herein by reference.
11 * 11 *
12 * Ext3-specific journaling extensions. 12 * Ext4-specific journaling extensions.
13 */ 13 */
14 14
15#ifndef _LINUX_EXT3_JBD_H 15#ifndef _LINUX_EXT4_JBD_H
16#define _LINUX_EXT3_JBD_H 16#define _LINUX_EXT4_JBD_H
17 17
18#include <linux/fs.h> 18#include <linux/fs.h>
19#include <linux/jbd.h> 19#include <linux/jbd.h>
20#include <linux/ext3_fs.h> 20#include <linux/ext4_fs.h>
21 21
22#define EXT3_JOURNAL(inode) (EXT3_SB((inode)->i_sb)->s_journal) 22#define EXT4_JOURNAL(inode) (EXT4_SB((inode)->i_sb)->s_journal)
23 23
24/* Define the number of blocks we need to account to a transaction to 24/* Define the number of blocks we need to account to a transaction to
25 * modify one block of data. 25 * modify one block of data.
@@ -28,13 +28,13 @@
28 * indirection blocks, the group and superblock summaries, and the data 28 * indirection blocks, the group and superblock summaries, and the data
29 * block to complete the transaction. */ 29 * block to complete the transaction. */
30 30
31#define EXT3_SINGLEDATA_TRANS_BLOCKS 8U 31#define EXT4_SINGLEDATA_TRANS_BLOCKS 8U
32 32
33/* Extended attribute operations touch at most two data buffers, 33/* Extended attribute operations touch at most two data buffers,
34 * two bitmap buffers, and two group summaries, in addition to the inode 34 * two bitmap buffers, and two group summaries, in addition to the inode
35 * and the superblock, which are already accounted for. */ 35 * and the superblock, which are already accounted for. */
36 36
37#define EXT3_XATTR_TRANS_BLOCKS 6U 37#define EXT4_XATTR_TRANS_BLOCKS 6U
38 38
39/* Define the minimum size for a transaction which modifies data. This 39/* Define the minimum size for a transaction which modifies data. This
40 * needs to take into account the fact that we may end up modifying two 40 * needs to take into account the fact that we may end up modifying two
@@ -42,15 +42,15 @@
42 * superblock only gets updated once, of course, so don't bother 42 * superblock only gets updated once, of course, so don't bother
43 * counting that again for the quota updates. */ 43 * counting that again for the quota updates. */
44 44
45#define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \ 45#define EXT4_DATA_TRANS_BLOCKS(sb) (EXT4_SINGLEDATA_TRANS_BLOCKS + \
46 EXT3_XATTR_TRANS_BLOCKS - 2 + \ 46 EXT4_XATTR_TRANS_BLOCKS - 2 + \
47 2*EXT3_QUOTA_TRANS_BLOCKS(sb)) 47 2*EXT4_QUOTA_TRANS_BLOCKS(sb))
48 48
49/* Delete operations potentially hit one directory's namespace plus an 49/* Delete operations potentially hit one directory's namespace plus an
50 * entire inode, plus arbitrary amounts of bitmap/indirection data. Be 50 * entire inode, plus arbitrary amounts of bitmap/indirection data. Be
51 * generous. We can grow the delete transaction later if necessary. */ 51 * generous. We can grow the delete transaction later if necessary. */
52 52
53#define EXT3_DELETE_TRANS_BLOCKS(sb) (2 * EXT3_DATA_TRANS_BLOCKS(sb) + 64) 53#define EXT4_DELETE_TRANS_BLOCKS(sb) (2 * EXT4_DATA_TRANS_BLOCKS(sb) + 64)
54 54
55/* Define an arbitrary limit for the amount of data we will anticipate 55/* Define an arbitrary limit for the amount of data we will anticipate
56 * writing to any given transaction. For unbounded transactions such as 56 * writing to any given transaction. For unbounded transactions such as
@@ -58,7 +58,7 @@
58 * start off at the maximum transaction size and grow the transaction 58 * start off at the maximum transaction size and grow the transaction
59 * optimistically as we go. */ 59 * optimistically as we go. */
60 60
61#define EXT3_MAX_TRANS_DATA 64U 61#define EXT4_MAX_TRANS_DATA 64U
62 62
63/* We break up a large truncate or write transaction once the handle's 63/* We break up a large truncate or write transaction once the handle's
64 * buffer credits gets this low, we need either to extend the 64 * buffer credits gets this low, we need either to extend the
@@ -67,202 +67,202 @@
67 * one block, plus two quota updates. Quota allocations are not 67 * one block, plus two quota updates. Quota allocations are not
68 * needed. */ 68 * needed. */
69 69
70#define EXT3_RESERVE_TRANS_BLOCKS 12U 70#define EXT4_RESERVE_TRANS_BLOCKS 12U
71 71
72#define EXT3_INDEX_EXTRA_TRANS_BLOCKS 8 72#define EXT4_INDEX_EXTRA_TRANS_BLOCKS 8
73 73
74#ifdef CONFIG_QUOTA 74#ifdef CONFIG_QUOTA
75/* Amount of blocks needed for quota update - we know that the structure was 75/* Amount of blocks needed for quota update - we know that the structure was
76 * allocated so we need to update only inode+data */ 76 * allocated so we need to update only inode+data */
77#define EXT3_QUOTA_TRANS_BLOCKS(sb) (test_opt(sb, QUOTA) ? 2 : 0) 77#define EXT4_QUOTA_TRANS_BLOCKS(sb) (test_opt(sb, QUOTA) ? 2 : 0)
78/* Amount of blocks needed for quota insert/delete - we do some block writes 78/* Amount of blocks needed for quota insert/delete - we do some block writes
79 * but inode, sb and group updates are done only once */ 79 * but inode, sb and group updates are done only once */
80#define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_INIT_ALLOC*\ 80#define EXT4_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_INIT_ALLOC*\
81 (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0) 81 (EXT4_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
82#define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_DEL_ALLOC*\ 82#define EXT4_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_DEL_ALLOC*\
83 (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0) 83 (EXT4_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
84#else 84#else
85#define EXT3_QUOTA_TRANS_BLOCKS(sb) 0 85#define EXT4_QUOTA_TRANS_BLOCKS(sb) 0
86#define EXT3_QUOTA_INIT_BLOCKS(sb) 0 86#define EXT4_QUOTA_INIT_BLOCKS(sb) 0
87#define EXT3_QUOTA_DEL_BLOCKS(sb) 0 87#define EXT4_QUOTA_DEL_BLOCKS(sb) 0
88#endif 88#endif
89 89
90int 90int
91ext3_mark_iloc_dirty(handle_t *handle, 91ext4_mark_iloc_dirty(handle_t *handle,
92 struct inode *inode, 92 struct inode *inode,
93 struct ext3_iloc *iloc); 93 struct ext4_iloc *iloc);
94 94
95/* 95/*
96 * On success, We end up with an outstanding reference count against 96 * On success, We end up with an outstanding reference count against
97 * iloc->bh. This _must_ be cleaned up later. 97 * iloc->bh. This _must_ be cleaned up later.
98 */ 98 */
99 99
100int ext3_reserve_inode_write(handle_t *handle, struct inode *inode, 100int ext4_reserve_inode_write(handle_t *handle, struct inode *inode,
101 struct ext3_iloc *iloc); 101 struct ext4_iloc *iloc);
102 102
103int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode); 103int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode);
104 104
105/* 105/*
106 * Wrapper functions with which ext3 calls into JBD. The intent here is 106 * Wrapper functions with which ext4 calls into JBD. The intent here is
107 * to allow these to be turned into appropriate stubs so ext3 can control 107 * to allow these to be turned into appropriate stubs so ext4 can control
108 * ext2 filesystems, so ext2+ext3 systems only nee one fs. This work hasn't 108 * ext2 filesystems, so ext2+ext4 systems only nee one fs. This work hasn't
109 * been done yet. 109 * been done yet.
110 */ 110 */
111 111
112void ext3_journal_abort_handle(const char *caller, const char *err_fn, 112void ext4_journal_abort_handle(const char *caller, const char *err_fn,
113 struct buffer_head *bh, handle_t *handle, int err); 113 struct buffer_head *bh, handle_t *handle, int err);
114 114
115static inline int 115static inline int
116__ext3_journal_get_undo_access(const char *where, handle_t *handle, 116__ext4_journal_get_undo_access(const char *where, handle_t *handle,
117 struct buffer_head *bh) 117 struct buffer_head *bh)
118{ 118{
119 int err = journal_get_undo_access(handle, bh); 119 int err = journal_get_undo_access(handle, bh);
120 if (err) 120 if (err)
121 ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err); 121 ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
122 return err; 122 return err;
123} 123}
124 124
125static inline int 125static inline int
126__ext3_journal_get_write_access(const char *where, handle_t *handle, 126__ext4_journal_get_write_access(const char *where, handle_t *handle,
127 struct buffer_head *bh) 127 struct buffer_head *bh)
128{ 128{
129 int err = journal_get_write_access(handle, bh); 129 int err = journal_get_write_access(handle, bh);
130 if (err) 130 if (err)
131 ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err); 131 ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
132 return err; 132 return err;
133} 133}
134 134
135static inline void 135static inline void
136ext3_journal_release_buffer(handle_t *handle, struct buffer_head *bh) 136ext4_journal_release_buffer(handle_t *handle, struct buffer_head *bh)
137{ 137{
138 journal_release_buffer(handle, bh); 138 journal_release_buffer(handle, bh);
139} 139}
140 140
141static inline int 141static inline int
142__ext3_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh) 142__ext4_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh)
143{ 143{
144 int err = journal_forget(handle, bh); 144 int err = journal_forget(handle, bh);
145 if (err) 145 if (err)
146 ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err); 146 ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
147 return err; 147 return err;
148} 148}
149 149
150static inline int 150static inline int
151__ext3_journal_revoke(const char *where, handle_t *handle, 151__ext4_journal_revoke(const char *where, handle_t *handle,
152 unsigned long blocknr, struct buffer_head *bh) 152 unsigned long blocknr, struct buffer_head *bh)
153{ 153{
154 int err = journal_revoke(handle, blocknr, bh); 154 int err = journal_revoke(handle, blocknr, bh);
155 if (err) 155 if (err)
156 ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err); 156 ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
157 return err; 157 return err;
158} 158}
159 159
160static inline int 160static inline int
161__ext3_journal_get_create_access(const char *where, 161__ext4_journal_get_create_access(const char *where,
162 handle_t *handle, struct buffer_head *bh) 162 handle_t *handle, struct buffer_head *bh)
163{ 163{
164 int err = journal_get_create_access(handle, bh); 164 int err = journal_get_create_access(handle, bh);
165 if (err) 165 if (err)
166 ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err); 166 ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
167 return err; 167 return err;
168} 168}
169 169
170static inline int 170static inline int
171__ext3_journal_dirty_metadata(const char *where, 171__ext4_journal_dirty_metadata(const char *where,
172 handle_t *handle, struct buffer_head *bh) 172 handle_t *handle, struct buffer_head *bh)
173{ 173{
174 int err = journal_dirty_metadata(handle, bh); 174 int err = journal_dirty_metadata(handle, bh);
175 if (err) 175 if (err)
176 ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err); 176 ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
177 return err; 177 return err;
178} 178}
179 179
180 180
181#define ext3_journal_get_undo_access(handle, bh) \ 181#define ext4_journal_get_undo_access(handle, bh) \
182 __ext3_journal_get_undo_access(__FUNCTION__, (handle), (bh)) 182 __ext4_journal_get_undo_access(__FUNCTION__, (handle), (bh))
183#define ext3_journal_get_write_access(handle, bh) \ 183#define ext4_journal_get_write_access(handle, bh) \
184 __ext3_journal_get_write_access(__FUNCTION__, (handle), (bh)) 184 __ext4_journal_get_write_access(__FUNCTION__, (handle), (bh))
185#define ext3_journal_revoke(handle, blocknr, bh) \ 185#define ext4_journal_revoke(handle, blocknr, bh) \
186 __ext3_journal_revoke(__FUNCTION__, (handle), (blocknr), (bh)) 186 __ext4_journal_revoke(__FUNCTION__, (handle), (blocknr), (bh))
187#define ext3_journal_get_create_access(handle, bh) \ 187#define ext4_journal_get_create_access(handle, bh) \
188 __ext3_journal_get_create_access(__FUNCTION__, (handle), (bh)) 188 __ext4_journal_get_create_access(__FUNCTION__, (handle), (bh))
189#define ext3_journal_dirty_metadata(handle, bh) \ 189#define ext4_journal_dirty_metadata(handle, bh) \
190 __ext3_journal_dirty_metadata(__FUNCTION__, (handle), (bh)) 190 __ext4_journal_dirty_metadata(__FUNCTION__, (handle), (bh))
191#define ext3_journal_forget(handle, bh) \ 191#define ext4_journal_forget(handle, bh) \
192 __ext3_journal_forget(__FUNCTION__, (handle), (bh)) 192 __ext4_journal_forget(__FUNCTION__, (handle), (bh))
193 193
194int ext3_journal_dirty_data(handle_t *handle, struct buffer_head *bh); 194int ext4_journal_dirty_data(handle_t *handle, struct buffer_head *bh);
195 195
196handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks); 196handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks);
197int __ext3_journal_stop(const char *where, handle_t *handle); 197int __ext4_journal_stop(const char *where, handle_t *handle);
198 198
199static inline handle_t *ext3_journal_start(struct inode *inode, int nblocks) 199static inline handle_t *ext4_journal_start(struct inode *inode, int nblocks)
200{ 200{
201 return ext3_journal_start_sb(inode->i_sb, nblocks); 201 return ext4_journal_start_sb(inode->i_sb, nblocks);
202} 202}
203 203
204#define ext3_journal_stop(handle) \ 204#define ext4_journal_stop(handle) \
205 __ext3_journal_stop(__FUNCTION__, (handle)) 205 __ext4_journal_stop(__FUNCTION__, (handle))
206 206
207static inline handle_t *ext3_journal_current_handle(void) 207static inline handle_t *ext4_journal_current_handle(void)
208{ 208{
209 return journal_current_handle(); 209 return journal_current_handle();
210} 210}
211 211
212static inline int ext3_journal_extend(handle_t *handle, int nblocks) 212static inline int ext4_journal_extend(handle_t *handle, int nblocks)
213{ 213{
214 return journal_extend(handle, nblocks); 214 return journal_extend(handle, nblocks);
215} 215}
216 216
217static inline int ext3_journal_restart(handle_t *handle, int nblocks) 217static inline int ext4_journal_restart(handle_t *handle, int nblocks)
218{ 218{
219 return journal_restart(handle, nblocks); 219 return journal_restart(handle, nblocks);
220} 220}
221 221
222static inline int ext3_journal_blocks_per_page(struct inode *inode) 222static inline int ext4_journal_blocks_per_page(struct inode *inode)
223{ 223{
224 return journal_blocks_per_page(inode); 224 return journal_blocks_per_page(inode);
225} 225}
226 226
227static inline int ext3_journal_force_commit(journal_t *journal) 227static inline int ext4_journal_force_commit(journal_t *journal)
228{ 228{
229 return journal_force_commit(journal); 229 return journal_force_commit(journal);
230} 230}
231 231
232/* super.c */ 232/* super.c */
233int ext3_force_commit(struct super_block *sb); 233int ext4_force_commit(struct super_block *sb);
234 234
235static inline int ext3_should_journal_data(struct inode *inode) 235static inline int ext4_should_journal_data(struct inode *inode)
236{ 236{
237 if (!S_ISREG(inode->i_mode)) 237 if (!S_ISREG(inode->i_mode))
238 return 1; 238 return 1;
239 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA) 239 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)
240 return 1; 240 return 1;
241 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL) 241 if (EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL)
242 return 1; 242 return 1;
243 return 0; 243 return 0;
244} 244}
245 245
246static inline int ext3_should_order_data(struct inode *inode) 246static inline int ext4_should_order_data(struct inode *inode)
247{ 247{
248 if (!S_ISREG(inode->i_mode)) 248 if (!S_ISREG(inode->i_mode))
249 return 0; 249 return 0;
250 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL) 250 if (EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL)
251 return 0; 251 return 0;
252 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA) 252 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA)
253 return 1; 253 return 1;
254 return 0; 254 return 0;
255} 255}
256 256
257static inline int ext3_should_writeback_data(struct inode *inode) 257static inline int ext4_should_writeback_data(struct inode *inode)
258{ 258{
259 if (!S_ISREG(inode->i_mode)) 259 if (!S_ISREG(inode->i_mode))
260 return 0; 260 return 0;
261 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL) 261 if (EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL)
262 return 0; 262 return 0;
263 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_WRITEBACK_DATA) 263 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)
264 return 1; 264 return 1;
265 return 0; 265 return 0;
266} 266}
267 267
268#endif /* _LINUX_EXT3_JBD_H */ 268#endif /* _LINUX_EXT4_JBD_H */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-22 09:07:27 -0500