summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-23 16:45:51 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-31 16:03:16 -0400
commitf7699f2b0114fcd0ea5ad5f8aa2142f1bcc27fd0 (patch)
tree054330e3e093e8b19eaeb4a60e93b936cde22266
parent39429c5e4a2c56a39c9a1c9bdad54431c63104b0 (diff)
migrate ext2_fs.h guts to fs/ext2/ext2.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/ext2/ext2.h631
-rw-r--r--fs/ext2/xattr_security.c5
-rw-r--r--fs/ext2/xattr_trusted.c5
-rw-r--r--fs/ext2/xip.c2
-rw-r--r--include/linux/ext2_fs.h521
-rw-r--r--include/linux/ext2_fs_sb.h126
6 files changed, 634 insertions, 656 deletions
diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index 75ad433c6691..0b2b4db5bdcd 100644
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -1,5 +1,636 @@
1/*
2 * Copyright (C) 1992, 1993, 1994, 1995
3 * Remy Card (card@masi.ibp.fr)
4 * Laboratoire MASI - Institut Blaise Pascal
5 * Universite Pierre et Marie Curie (Paris VI)
6 *
7 * from
8 *
9 * linux/include/linux/minix_fs.h
10 *
11 * Copyright (C) 1991, 1992 Linus Torvalds
12 */
1#include <linux/fs.h> 13#include <linux/fs.h>
2#include <linux/ext2_fs.h> 14#include <linux/ext2_fs.h>
15#include <linux/blockgroup_lock.h>
16#include <linux/percpu_counter.h>
17#include <linux/rbtree.h>
18
19/* XXX Here for now... not interested in restructing headers JUST now */
20
21/* data type for block offset of block group */
22typedef int ext2_grpblk_t;
23
24/* data type for filesystem-wide blocks number */
25typedef unsigned long ext2_fsblk_t;
26
27#define E2FSBLK "%lu"
28
29struct ext2_reserve_window {
30 ext2_fsblk_t _rsv_start; /* First byte reserved */
31 ext2_fsblk_t _rsv_end; /* Last byte reserved or 0 */
32};
33
34struct ext2_reserve_window_node {
35 struct rb_node rsv_node;
36 __u32 rsv_goal_size;
37 __u32 rsv_alloc_hit;
38 struct ext2_reserve_window rsv_window;
39};
40
41struct ext2_block_alloc_info {
42 /* information about reservation window */
43 struct ext2_reserve_window_node rsv_window_node;
44 /*
45 * was i_next_alloc_block in ext2_inode_info
46 * is the logical (file-relative) number of the
47 * most-recently-allocated block in this file.
48 * We use this for detecting linearly ascending allocation requests.
49 */
50 __u32 last_alloc_logical_block;
51 /*
52 * Was i_next_alloc_goal in ext2_inode_info
53 * is the *physical* companion to i_next_alloc_block.
54 * it the the physical block number of the block which was most-recentl
55 * allocated to this file. This give us the goal (target) for the next
56 * allocation when we detect linearly ascending requests.
57 */
58 ext2_fsblk_t last_alloc_physical_block;
59};
60
61#define rsv_start rsv_window._rsv_start
62#define rsv_end rsv_window._rsv_end
63
64/*
65 * second extended-fs super-block data in memory
66 */
67struct ext2_sb_info {
68 unsigned long s_frag_size; /* Size of a fragment in bytes */
69 unsigned long s_frags_per_block;/* Number of fragments per block */
70 unsigned long s_inodes_per_block;/* Number of inodes per block */
71 unsigned long s_frags_per_group;/* Number of fragments in a group */
72 unsigned long s_blocks_per_group;/* Number of blocks in a group */
73 unsigned long s_inodes_per_group;/* Number of inodes in a group */
74 unsigned long s_itb_per_group; /* Number of inode table blocks per group */
75 unsigned long s_gdb_count; /* Number of group descriptor blocks */
76 unsigned long s_desc_per_block; /* Number of group descriptors per block */
77 unsigned long s_groups_count; /* Number of groups in the fs */
78 unsigned long s_overhead_last; /* Last calculated overhead */
79 unsigned long s_blocks_last; /* Last seen block count */
80 struct buffer_head * s_sbh; /* Buffer containing the super block */
81 struct ext2_super_block * s_es; /* Pointer to the super block in the buffer */
82 struct buffer_head ** s_group_desc;
83 unsigned long s_mount_opt;
84 unsigned long s_sb_block;
85 uid_t s_resuid;
86 gid_t s_resgid;
87 unsigned short s_mount_state;
88 unsigned short s_pad;
89 int s_addr_per_block_bits;
90 int s_desc_per_block_bits;
91 int s_inode_size;
92 int s_first_ino;
93 spinlock_t s_next_gen_lock;
94 u32 s_next_generation;
95 unsigned long s_dir_count;
96 u8 *s_debts;
97 struct percpu_counter s_freeblocks_counter;
98 struct percpu_counter s_freeinodes_counter;
99 struct percpu_counter s_dirs_counter;
100 struct blockgroup_lock *s_blockgroup_lock;
101 /* root of the per fs reservation window tree */
102 spinlock_t s_rsv_window_lock;
103 struct rb_root s_rsv_window_root;
104 struct ext2_reserve_window_node s_rsv_window_head;
105 /*
106 * s_lock protects against concurrent modifications of s_mount_state,
107 * s_blocks_last, s_overhead_last and the content of superblock's
108 * buffer pointed to by sbi->s_es.
109 *
110 * Note: It is used in ext2_show_options() to provide a consistent view
111 * of the mount options.
112 */
113 spinlock_t s_lock;
114};
115
116static inline spinlock_t *
117sb_bgl_lock(struct ext2_sb_info *sbi, unsigned int block_group)
118{
119 return bgl_lock_ptr(sbi->s_blockgroup_lock, block_group);
120}
121
122/*
123 * Define EXT2FS_DEBUG to produce debug messages
124 */
125#undef EXT2FS_DEBUG
126
127/*
128 * Define EXT2_RESERVATION to reserve data blocks for expanding files
129 */
130#define EXT2_DEFAULT_RESERVE_BLOCKS 8
131/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */
132#define EXT2_MAX_RESERVE_BLOCKS 1027
133#define EXT2_RESERVE_WINDOW_NOT_ALLOCATED 0
134/*
135 * The second extended file system version
136 */
137#define EXT2FS_DATE "95/08/09"
138#define EXT2FS_VERSION "0.5b"
139
140/*
141 * Debug code
142 */
143#ifdef EXT2FS_DEBUG
144# define ext2_debug(f, a...) { \
145 printk ("EXT2-fs DEBUG (%s, %d): %s:", \
146 __FILE__, __LINE__, __func__); \
147 printk (f, ## a); \
148 }
149#else
150# define ext2_debug(f, a...) /**/
151#endif
152
153/*
154 * Special inode numbers
155 */
156#define EXT2_BAD_INO 1 /* Bad blocks inode */
157#define EXT2_ROOT_INO 2 /* Root inode */
158#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */
159#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */
160
161/* First non-reserved inode for old ext2 filesystems */
162#define EXT2_GOOD_OLD_FIRST_INO 11
163
164static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
165{
166 return sb->s_fs_info;
167}
168
169/*
170 * Macro-instructions used to manage several block sizes
171 */
172#define EXT2_MIN_BLOCK_SIZE 1024
173#define EXT2_MAX_BLOCK_SIZE 4096
174#define EXT2_MIN_BLOCK_LOG_SIZE 10
175#define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize)
176#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
177#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits)
178#define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_addr_per_block_bits)
179#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size)
180#define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino)
181
182/*
183 * Macro-instructions used to manage fragments
184 */
185#define EXT2_MIN_FRAG_SIZE 1024
186#define EXT2_MAX_FRAG_SIZE 4096
187#define EXT2_MIN_FRAG_LOG_SIZE 10
188#define EXT2_FRAG_SIZE(s) (EXT2_SB(s)->s_frag_size)
189#define EXT2_FRAGS_PER_BLOCK(s) (EXT2_SB(s)->s_frags_per_block)
190
191/*
192 * Structure of a blocks group descriptor
193 */
194struct ext2_group_desc
195{
196 __le32 bg_block_bitmap; /* Blocks bitmap block */
197 __le32 bg_inode_bitmap; /* Inodes bitmap block */
198 __le32 bg_inode_table; /* Inodes table block */
199 __le16 bg_free_blocks_count; /* Free blocks count */
200 __le16 bg_free_inodes_count; /* Free inodes count */
201 __le16 bg_used_dirs_count; /* Directories count */
202 __le16 bg_pad;
203 __le32 bg_reserved[3];
204};
205
206/*
207 * Macro-instructions used to manage group descriptors
208 */
209#define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group)
210#define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block)
211#define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group)
212#define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits)
213
214/*
215 * Constants relative to the data blocks
216 */
217#define EXT2_NDIR_BLOCKS 12
218#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS
219#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1)
220#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1)
221#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1)
222
223/*
224 * Inode flags (GETFLAGS/SETFLAGS)
225 */
226#define EXT2_SECRM_FL FS_SECRM_FL /* Secure deletion */
227#define EXT2_UNRM_FL FS_UNRM_FL /* Undelete */
228#define EXT2_COMPR_FL FS_COMPR_FL /* Compress file */
229#define EXT2_SYNC_FL FS_SYNC_FL /* Synchronous updates */
230#define EXT2_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */
231#define EXT2_APPEND_FL FS_APPEND_FL /* writes to file may only append */
232#define EXT2_NODUMP_FL FS_NODUMP_FL /* do not dump file */
233#define EXT2_NOATIME_FL FS_NOATIME_FL /* do not update atime */
234/* Reserved for compression usage... */
235#define EXT2_DIRTY_FL FS_DIRTY_FL
236#define EXT2_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */
237#define EXT2_NOCOMP_FL FS_NOCOMP_FL /* Don't compress */
238#define EXT2_ECOMPR_FL FS_ECOMPR_FL /* Compression error */
239/* End compression flags --- maybe not all used */
240#define EXT2_BTREE_FL FS_BTREE_FL /* btree format dir */
241#define EXT2_INDEX_FL FS_INDEX_FL /* hash-indexed directory */
242#define EXT2_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */
243#define EXT2_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* Reserved for ext3 */
244#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
245#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
246#define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
247#define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
248
249#define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
250#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
251
252/* Flags that should be inherited by new inodes from their parent. */
253#define EXT2_FL_INHERITED (EXT2_SECRM_FL | EXT2_UNRM_FL | EXT2_COMPR_FL |\
254 EXT2_SYNC_FL | EXT2_NODUMP_FL |\
255 EXT2_NOATIME_FL | EXT2_COMPRBLK_FL |\
256 EXT2_NOCOMP_FL | EXT2_JOURNAL_DATA_FL |\
257 EXT2_NOTAIL_FL | EXT2_DIRSYNC_FL)
258
259/* Flags that are appropriate for regular files (all but dir-specific ones). */
260#define EXT2_REG_FLMASK (~(EXT2_DIRSYNC_FL | EXT2_TOPDIR_FL))
261
262/* Flags that are appropriate for non-directories/regular files. */
263#define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL)
264
265/* Mask out flags that are inappropriate for the given type of inode. */
266static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
267{
268 if (S_ISDIR(mode))
269 return flags;
270 else if (S_ISREG(mode))
271 return flags & EXT2_REG_FLMASK;
272 else
273 return flags & EXT2_OTHER_FLMASK;
274}
275
276/*
277 * ioctl commands
278 */
279#define EXT2_IOC_GETFLAGS FS_IOC_GETFLAGS
280#define EXT2_IOC_SETFLAGS FS_IOC_SETFLAGS
281#define EXT2_IOC_GETVERSION FS_IOC_GETVERSION
282#define EXT2_IOC_SETVERSION FS_IOC_SETVERSION
283#define EXT2_IOC_GETRSVSZ _IOR('f', 5, long)
284#define EXT2_IOC_SETRSVSZ _IOW('f', 6, long)
285
286/*
287 * ioctl commands in 32 bit emulation
288 */
289#define EXT2_IOC32_GETFLAGS FS_IOC32_GETFLAGS
290#define EXT2_IOC32_SETFLAGS FS_IOC32_SETFLAGS
291#define EXT2_IOC32_GETVERSION FS_IOC32_GETVERSION
292#define EXT2_IOC32_SETVERSION FS_IOC32_SETVERSION
293
294/*
295 * Structure of an inode on the disk
296 */
297struct ext2_inode {
298 __le16 i_mode; /* File mode */
299 __le16 i_uid; /* Low 16 bits of Owner Uid */
300 __le32 i_size; /* Size in bytes */
301 __le32 i_atime; /* Access time */
302 __le32 i_ctime; /* Creation time */
303 __le32 i_mtime; /* Modification time */
304 __le32 i_dtime; /* Deletion Time */
305 __le16 i_gid; /* Low 16 bits of Group Id */
306 __le16 i_links_count; /* Links count */
307 __le32 i_blocks; /* Blocks count */
308 __le32 i_flags; /* File flags */
309 union {
310 struct {
311 __le32 l_i_reserved1;
312 } linux1;
313 struct {
314 __le32 h_i_translator;
315 } hurd1;
316 struct {
317 __le32 m_i_reserved1;
318 } masix1;
319 } osd1; /* OS dependent 1 */
320 __le32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
321 __le32 i_generation; /* File version (for NFS) */
322 __le32 i_file_acl; /* File ACL */
323 __le32 i_dir_acl; /* Directory ACL */
324 __le32 i_faddr; /* Fragment address */
325 union {
326 struct {
327 __u8 l_i_frag; /* Fragment number */
328 __u8 l_i_fsize; /* Fragment size */
329 __u16 i_pad1;
330 __le16 l_i_uid_high; /* these 2 fields */
331 __le16 l_i_gid_high; /* were reserved2[0] */
332 __u32 l_i_reserved2;
333 } linux2;
334 struct {
335 __u8 h_i_frag; /* Fragment number */
336 __u8 h_i_fsize; /* Fragment size */
337 __le16 h_i_mode_high;
338 __le16 h_i_uid_high;
339 __le16 h_i_gid_high;
340 __le32 h_i_author;
341 } hurd2;
342 struct {
343 __u8 m_i_frag; /* Fragment number */
344 __u8 m_i_fsize; /* Fragment size */
345 __u16 m_pad1;
346 __u32 m_i_reserved2[2];
347 } masix2;
348 } osd2; /* OS dependent 2 */
349};
350
351#define i_size_high i_dir_acl
352
353#define i_reserved1 osd1.linux1.l_i_reserved1
354#define i_frag osd2.linux2.l_i_frag
355#define i_fsize osd2.linux2.l_i_fsize
356#define i_uid_low i_uid
357#define i_gid_low i_gid
358#define i_uid_high osd2.linux2.l_i_uid_high
359#define i_gid_high osd2.linux2.l_i_gid_high
360#define i_reserved2 osd2.linux2.l_i_reserved2
361
362/*
363 * File system states
364 */
365#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */
366#define EXT2_ERROR_FS 0x0002 /* Errors detected */
367
368/*
369 * Mount flags
370 */
371#define EXT2_MOUNT_CHECK 0x000001 /* Do mount-time checks */
372#define EXT2_MOUNT_OLDALLOC 0x000002 /* Don't use the new Orlov allocator */
373#define EXT2_MOUNT_GRPID 0x000004 /* Create files with directory's group */
374#define EXT2_MOUNT_DEBUG 0x000008 /* Some debugging messages */
375#define EXT2_MOUNT_ERRORS_CONT 0x000010 /* Continue on errors */
376#define EXT2_MOUNT_ERRORS_RO 0x000020 /* Remount fs ro on errors */
377#define EXT2_MOUNT_ERRORS_PANIC 0x000040 /* Panic on errors */
378#define EXT2_MOUNT_MINIX_DF 0x000080 /* Mimics the Minix statfs */
379#define EXT2_MOUNT_NOBH 0x000100 /* No buffer_heads */
380#define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */
381#define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */
382#define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */
383#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */
384#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
385#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
386#define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
387
388
389#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
390#define set_opt(o, opt) o |= EXT2_MOUNT_##opt
391#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \
392 EXT2_MOUNT_##opt)
393/*
394 * Maximal mount counts between two filesystem checks
395 */
396#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */
397#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */
398
399/*
400 * Behaviour when detecting errors
401 */
402#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */
403#define EXT2_ERRORS_RO 2 /* Remount fs read-only */
404#define EXT2_ERRORS_PANIC 3 /* Panic */
405#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE
406
407/*
408 * Structure of the super block
409 */
410struct ext2_super_block {
411 __le32 s_inodes_count; /* Inodes count */
412 __le32 s_blocks_count; /* Blocks count */
413 __le32 s_r_blocks_count; /* Reserved blocks count */
414 __le32 s_free_blocks_count; /* Free blocks count */
415 __le32 s_free_inodes_count; /* Free inodes count */
416 __le32 s_first_data_block; /* First Data Block */
417 __le32 s_log_block_size; /* Block size */
418 __le32 s_log_frag_size; /* Fragment size */
419 __le32 s_blocks_per_group; /* # Blocks per group */
420 __le32 s_frags_per_group; /* # Fragments per group */
421 __le32 s_inodes_per_group; /* # Inodes per group */
422 __le32 s_mtime; /* Mount time */
423 __le32 s_wtime; /* Write time */
424 __le16 s_mnt_count; /* Mount count */
425 __le16 s_max_mnt_count; /* Maximal mount count */
426 __le16 s_magic; /* Magic signature */
427 __le16 s_state; /* File system state */
428 __le16 s_errors; /* Behaviour when detecting errors */
429 __le16 s_minor_rev_level; /* minor revision level */
430 __le32 s_lastcheck; /* time of last check */
431 __le32 s_checkinterval; /* max. time between checks */
432 __le32 s_creator_os; /* OS */
433 __le32 s_rev_level; /* Revision level */
434 __le16 s_def_resuid; /* Default uid for reserved blocks */
435 __le16 s_def_resgid; /* Default gid for reserved blocks */
436 /*
437 * These fields are for EXT2_DYNAMIC_REV superblocks only.
438 *
439 * Note: the difference between the compatible feature set and
440 * the incompatible feature set is that if there is a bit set
441 * in the incompatible feature set that the kernel doesn't
442 * know about, it should refuse to mount the filesystem.
443 *
444 * e2fsck's requirements are more strict; if it doesn't know
445 * about a feature in either the compatible or incompatible
446 * feature set, it must abort and not try to meddle with
447 * things it doesn't understand...
448 */
449 __le32 s_first_ino; /* First non-reserved inode */
450 __le16 s_inode_size; /* size of inode structure */
451 __le16 s_block_group_nr; /* block group # of this superblock */
452 __le32 s_feature_compat; /* compatible feature set */
453 __le32 s_feature_incompat; /* incompatible feature set */
454 __le32 s_feature_ro_compat; /* readonly-compatible feature set */
455 __u8 s_uuid[16]; /* 128-bit uuid for volume */
456 char s_volume_name[16]; /* volume name */
457 char s_last_mounted[64]; /* directory where last mounted */
458 __le32 s_algorithm_usage_bitmap; /* For compression */
459 /*
460 * Performance hints. Directory preallocation should only
461 * happen if the EXT2_COMPAT_PREALLOC flag is on.
462 */
463 __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
464 __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
465 __u16 s_padding1;
466 /*
467 * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set.
468 */
469 __u8 s_journal_uuid[16]; /* uuid of journal superblock */
470 __u32 s_journal_inum; /* inode number of journal file */
471 __u32 s_journal_dev; /* device number of journal file */
472 __u32 s_last_orphan; /* start of list of inodes to delete */
473 __u32 s_hash_seed[4]; /* HTREE hash seed */
474 __u8 s_def_hash_version; /* Default hash version to use */
475 __u8 s_reserved_char_pad;
476 __u16 s_reserved_word_pad;
477 __le32 s_default_mount_opts;
478 __le32 s_first_meta_bg; /* First metablock block group */
479 __u32 s_reserved[190]; /* Padding to the end of the block */
480};
481
482/*
483 * Codes for operating systems
484 */
485#define EXT2_OS_LINUX 0
486#define EXT2_OS_HURD 1
487#define EXT2_OS_MASIX 2
488#define EXT2_OS_FREEBSD 3
489#define EXT2_OS_LITES 4
490
491/*
492 * Revision levels
493 */
494#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */
495#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */
496
497#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV
498#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV
499
500#define EXT2_GOOD_OLD_INODE_SIZE 128
501
502/*
503 * Feature set definitions
504 */
505
506#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \
507 ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) )
508#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \
509 ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) )
510#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \
511 ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) )
512#define EXT2_SET_COMPAT_FEATURE(sb,mask) \
513 EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask)
514#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask) \
515 EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask)
516#define EXT2_SET_INCOMPAT_FEATURE(sb,mask) \
517 EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask)
518#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask) \
519 EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask)
520#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask) \
521 EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask)
522#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask) \
523 EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask)
524
525#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001
526#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002
527#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004
528#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008
529#define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010
530#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020
531#define EXT2_FEATURE_COMPAT_ANY 0xffffffff
532
533#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
534#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
535#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
536#define EXT2_FEATURE_RO_COMPAT_ANY 0xffffffff
537
538#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001
539#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
540#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004
541#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008
542#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010
543#define EXT2_FEATURE_INCOMPAT_ANY 0xffffffff
544
545#define EXT2_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
546#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
547 EXT2_FEATURE_INCOMPAT_META_BG)
548#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
549 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
550 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
551#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP
552#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP
553
554/*
555 * Default values for user and/or group using reserved blocks
556 */
557#define EXT2_DEF_RESUID 0
558#define EXT2_DEF_RESGID 0
559
560/*
561 * Default mount options
562 */
563#define EXT2_DEFM_DEBUG 0x0001
564#define EXT2_DEFM_BSDGROUPS 0x0002
565#define EXT2_DEFM_XATTR_USER 0x0004
566#define EXT2_DEFM_ACL 0x0008
567#define EXT2_DEFM_UID16 0x0010
568 /* Not used by ext2, but reserved for use by ext3 */
569#define EXT3_DEFM_JMODE 0x0060
570#define EXT3_DEFM_JMODE_DATA 0x0020
571#define EXT3_DEFM_JMODE_ORDERED 0x0040
572#define EXT3_DEFM_JMODE_WBACK 0x0060
573
574/*
575 * Structure of a directory entry
576 */
577
578struct ext2_dir_entry {
579 __le32 inode; /* Inode number */
580 __le16 rec_len; /* Directory entry length */
581 __le16 name_len; /* Name length */
582 char name[]; /* File name, up to EXT2_NAME_LEN */
583};
584
585/*
586 * The new version of the directory entry. Since EXT2 structures are
587 * stored in intel byte order, and the name_len field could never be
588 * bigger than 255 chars, it's safe to reclaim the extra byte for the
589 * file_type field.
590 */
591struct ext2_dir_entry_2 {
592 __le32 inode; /* Inode number */
593 __le16 rec_len; /* Directory entry length */
594 __u8 name_len; /* Name length */
595 __u8 file_type;
596 char name[]; /* File name, up to EXT2_NAME_LEN */
597};
598
599/*
600 * Ext2 directory file types. Only the low 3 bits are used. The
601 * other bits are reserved for now.
602 */
603enum {
604 EXT2_FT_UNKNOWN = 0,
605 EXT2_FT_REG_FILE = 1,
606 EXT2_FT_DIR = 2,
607 EXT2_FT_CHRDEV = 3,
608 EXT2_FT_BLKDEV = 4,
609 EXT2_FT_FIFO = 5,
610 EXT2_FT_SOCK = 6,
611 EXT2_FT_SYMLINK = 7,
612 EXT2_FT_MAX
613};
614
615/*
616 * EXT2_DIR_PAD defines the directory entries boundaries
617 *
618 * NOTE: It must be a multiple of 4
619 */
620#define EXT2_DIR_PAD 4
621#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1)
622#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
623 ~EXT2_DIR_ROUND)
624#define EXT2_MAX_REC_LEN ((1<<16)-1)
625
626static inline void verify_offsets(void)
627{
628#define A(x,y) BUILD_BUG_ON(x != offsetof(struct ext2_super_block, y));
629 A(EXT2_SB_MAGIC_OFFSET, s_magic);
630 A(EXT2_SB_BLOCKS_OFFSET, s_blocks_count);
631 A(EXT2_SB_BSIZE_OFFSET, s_log_block_size);
632#undef A
633}
3 634
4/* 635/*
5 * ext2 mount options 636 * ext2 mount options
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index be7a8d02c9a7..cfedb2cb0d8c 100644
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -3,10 +3,7 @@
3 * Handler for storing security labels as extended attributes. 3 * Handler for storing security labels as extended attributes.
4 */ 4 */
5 5
6#include <linux/slab.h> 6#include "ext2.h"
7#include <linux/string.h>
8#include <linux/fs.h>
9#include <linux/ext2_fs.h>
10#include <linux/security.h> 7#include <linux/security.h>
11#include "xattr.h" 8#include "xattr.h"
12 9
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c
index 2989467d3595..7e192574c001 100644
--- a/fs/ext2/xattr_trusted.c
+++ b/fs/ext2/xattr_trusted.c
@@ -5,10 +5,7 @@
5 * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org> 5 * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
6 */ 6 */
7 7
8#include <linux/string.h> 8#include "ext2.h"
9#include <linux/capability.h>
10#include <linux/fs.h>
11#include <linux/ext2_fs.h>
12#include "xattr.h" 9#include "xattr.h"
13 10
14static size_t 11static size_t
diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c
index 322a56b2dfb1..1c3312858fcf 100644
--- a/fs/ext2/xip.c
+++ b/fs/ext2/xip.c
@@ -9,8 +9,6 @@
9#include <linux/fs.h> 9#include <linux/fs.h>
10#include <linux/genhd.h> 10#include <linux/genhd.h>
11#include <linux/buffer_head.h> 11#include <linux/buffer_head.h>
12#include <linux/ext2_fs_sb.h>
13#include <linux/ext2_fs.h>
14#include <linux/blkdev.h> 12#include <linux/blkdev.h>
15#include "ext2.h" 13#include "ext2.h"
16#include "xip.h" 14#include "xip.h"
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 5f65ec75b48a..2723e715f67a 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -18,524 +18,14 @@
18 18
19#include <linux/types.h> 19#include <linux/types.h>
20#include <linux/magic.h> 20#include <linux/magic.h>
21#include <linux/fs.h>
22 21
23#include <linux/ext2_fs_sb.h> 22#define EXT2_NAME_LEN 255
24
25/*
26 * The second extended filesystem constants/structures
27 */
28
29/*
30 * Define EXT2FS_DEBUG to produce debug messages
31 */
32#undef EXT2FS_DEBUG
33
34/*
35 * Define EXT2_RESERVATION to reserve data blocks for expanding files
36 */
37#define EXT2_DEFAULT_RESERVE_BLOCKS 8
38/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */
39#define EXT2_MAX_RESERVE_BLOCKS 1027
40#define EXT2_RESERVE_WINDOW_NOT_ALLOCATED 0
41/*
42 * The second extended file system version
43 */
44#define EXT2FS_DATE "95/08/09"
45#define EXT2FS_VERSION "0.5b"
46
47/*
48 * Debug code
49 */
50#ifdef EXT2FS_DEBUG
51# define ext2_debug(f, a...) { \
52 printk ("EXT2-fs DEBUG (%s, %d): %s:", \
53 __FILE__, __LINE__, __func__); \
54 printk (f, ## a); \
55 }
56#else
57# define ext2_debug(f, a...) /**/
58#endif
59
60/*
61 * Special inode numbers
62 */
63#define EXT2_BAD_INO 1 /* Bad blocks inode */
64#define EXT2_ROOT_INO 2 /* Root inode */
65#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */
66#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */
67
68/* First non-reserved inode for old ext2 filesystems */
69#define EXT2_GOOD_OLD_FIRST_INO 11
70
71static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
72{
73 return sb->s_fs_info;
74}
75 23
76/* 24/*
77 * Maximal count of links to a file 25 * Maximal count of links to a file
78 */ 26 */
79#define EXT2_LINK_MAX 32000 27#define EXT2_LINK_MAX 32000
80 28
81/*
82 * Macro-instructions used to manage several block sizes
83 */
84#define EXT2_MIN_BLOCK_SIZE 1024
85#define EXT2_MAX_BLOCK_SIZE 4096
86#define EXT2_MIN_BLOCK_LOG_SIZE 10
87#define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize)
88#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
89#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits)
90#define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_addr_per_block_bits)
91#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size)
92#define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino)
93
94/*
95 * Macro-instructions used to manage fragments
96 */
97#define EXT2_MIN_FRAG_SIZE 1024
98#define EXT2_MAX_FRAG_SIZE 4096
99#define EXT2_MIN_FRAG_LOG_SIZE 10
100#define EXT2_FRAG_SIZE(s) (EXT2_SB(s)->s_frag_size)
101#define EXT2_FRAGS_PER_BLOCK(s) (EXT2_SB(s)->s_frags_per_block)
102
103/*
104 * Structure of a blocks group descriptor
105 */
106struct ext2_group_desc
107{
108 __le32 bg_block_bitmap; /* Blocks bitmap block */
109 __le32 bg_inode_bitmap; /* Inodes bitmap block */
110 __le32 bg_inode_table; /* Inodes table block */
111 __le16 bg_free_blocks_count; /* Free blocks count */
112 __le16 bg_free_inodes_count; /* Free inodes count */
113 __le16 bg_used_dirs_count; /* Directories count */
114 __le16 bg_pad;
115 __le32 bg_reserved[3];
116};
117
118/*
119 * Macro-instructions used to manage group descriptors
120 */
121#define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group)
122#define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block)
123#define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group)
124#define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits)
125
126/*
127 * Constants relative to the data blocks
128 */
129#define EXT2_NDIR_BLOCKS 12
130#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS
131#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1)
132#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1)
133#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1)
134
135/*
136 * Inode flags (GETFLAGS/SETFLAGS)
137 */
138#define EXT2_SECRM_FL FS_SECRM_FL /* Secure deletion */
139#define EXT2_UNRM_FL FS_UNRM_FL /* Undelete */
140#define EXT2_COMPR_FL FS_COMPR_FL /* Compress file */
141#define EXT2_SYNC_FL FS_SYNC_FL /* Synchronous updates */
142#define EXT2_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */
143#define EXT2_APPEND_FL FS_APPEND_FL /* writes to file may only append */
144#define EXT2_NODUMP_FL FS_NODUMP_FL /* do not dump file */
145#define EXT2_NOATIME_FL FS_NOATIME_FL /* do not update atime */
146/* Reserved for compression usage... */
147#define EXT2_DIRTY_FL FS_DIRTY_FL
148#define EXT2_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */
149#define EXT2_NOCOMP_FL FS_NOCOMP_FL /* Don't compress */
150#define EXT2_ECOMPR_FL FS_ECOMPR_FL /* Compression error */
151/* End compression flags --- maybe not all used */
152#define EXT2_BTREE_FL FS_BTREE_FL /* btree format dir */
153#define EXT2_INDEX_FL FS_INDEX_FL /* hash-indexed directory */
154#define EXT2_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */
155#define EXT2_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* Reserved for ext3 */
156#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
157#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
158#define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
159#define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
160
161#define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
162#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
163
164/* Flags that should be inherited by new inodes from their parent. */
165#define EXT2_FL_INHERITED (EXT2_SECRM_FL | EXT2_UNRM_FL | EXT2_COMPR_FL |\
166 EXT2_SYNC_FL | EXT2_NODUMP_FL |\
167 EXT2_NOATIME_FL | EXT2_COMPRBLK_FL |\
168 EXT2_NOCOMP_FL | EXT2_JOURNAL_DATA_FL |\
169 EXT2_NOTAIL_FL | EXT2_DIRSYNC_FL)
170
171/* Flags that are appropriate for regular files (all but dir-specific ones). */
172#define EXT2_REG_FLMASK (~(EXT2_DIRSYNC_FL | EXT2_TOPDIR_FL))
173
174/* Flags that are appropriate for non-directories/regular files. */
175#define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL)
176
177/* Mask out flags that are inappropriate for the given type of inode. */
178static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
179{
180 if (S_ISDIR(mode))
181 return flags;
182 else if (S_ISREG(mode))
183 return flags & EXT2_REG_FLMASK;
184 else
185 return flags & EXT2_OTHER_FLMASK;
186}
187
188/*
189 * ioctl commands
190 */
191#define EXT2_IOC_GETFLAGS FS_IOC_GETFLAGS
192#define EXT2_IOC_SETFLAGS FS_IOC_SETFLAGS
193#define EXT2_IOC_GETVERSION FS_IOC_GETVERSION
194#define EXT2_IOC_SETVERSION FS_IOC_SETVERSION
195#define EXT2_IOC_GETRSVSZ _IOR('f', 5, long)
196#define EXT2_IOC_SETRSVSZ _IOW('f', 6, long)
197
198/*
199 * ioctl commands in 32 bit emulation
200 */
201#define EXT2_IOC32_GETFLAGS FS_IOC32_GETFLAGS
202#define EXT2_IOC32_SETFLAGS FS_IOC32_SETFLAGS
203#define EXT2_IOC32_GETVERSION FS_IOC32_GETVERSION
204#define EXT2_IOC32_SETVERSION FS_IOC32_SETVERSION
205
206/*
207 * Structure of an inode on the disk
208 */
209struct ext2_inode {
210 __le16 i_mode; /* File mode */
211 __le16 i_uid; /* Low 16 bits of Owner Uid */
212 __le32 i_size; /* Size in bytes */
213 __le32 i_atime; /* Access time */
214 __le32 i_ctime; /* Creation time */
215 __le32 i_mtime; /* Modification time */
216 __le32 i_dtime; /* Deletion Time */
217 __le16 i_gid; /* Low 16 bits of Group Id */
218 __le16 i_links_count; /* Links count */
219 __le32 i_blocks; /* Blocks count */
220 __le32 i_flags; /* File flags */
221 union {
222 struct {
223 __le32 l_i_reserved1;
224 } linux1;
225 struct {
226 __le32 h_i_translator;
227 } hurd1;
228 struct {
229 __le32 m_i_reserved1;
230 } masix1;
231 } osd1; /* OS dependent 1 */
232 __le32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
233 __le32 i_generation; /* File version (for NFS) */
234 __le32 i_file_acl; /* File ACL */
235 __le32 i_dir_acl; /* Directory ACL */
236 __le32 i_faddr; /* Fragment address */
237 union {
238 struct {
239 __u8 l_i_frag; /* Fragment number */
240 __u8 l_i_fsize; /* Fragment size */
241 __u16 i_pad1;
242 __le16 l_i_uid_high; /* these 2 fields */
243 __le16 l_i_gid_high; /* were reserved2[0] */
244 __u32 l_i_reserved2;
245 } linux2;
246 struct {
247 __u8 h_i_frag; /* Fragment number */
248 __u8 h_i_fsize; /* Fragment size */
249 __le16 h_i_mode_high;
250 __le16 h_i_uid_high;
251 __le16 h_i_gid_high;
252 __le32 h_i_author;
253 } hurd2;
254 struct {
255 __u8 m_i_frag; /* Fragment number */
256 __u8 m_i_fsize; /* Fragment size */
257 __u16 m_pad1;
258 __u32 m_i_reserved2[2];
259 } masix2;
260 } osd2; /* OS dependent 2 */
261};
262
263#define i_size_high i_dir_acl
264
265#define i_reserved1 osd1.linux1.l_i_reserved1
266#define i_frag osd2.linux2.l_i_frag
267#define i_fsize osd2.linux2.l_i_fsize
268#define i_uid_low i_uid
269#define i_gid_low i_gid
270#define i_uid_high osd2.linux2.l_i_uid_high
271#define i_gid_high osd2.linux2.l_i_gid_high
272#define i_reserved2 osd2.linux2.l_i_reserved2
273
274/*
275 * File system states
276 */
277#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */
278#define EXT2_ERROR_FS 0x0002 /* Errors detected */
279
280/*
281 * Mount flags
282 */
283#define EXT2_MOUNT_CHECK 0x000001 /* Do mount-time checks */
284#define EXT2_MOUNT_OLDALLOC 0x000002 /* Don't use the new Orlov allocator */
285#define EXT2_MOUNT_GRPID 0x000004 /* Create files with directory's group */
286#define EXT2_MOUNT_DEBUG 0x000008 /* Some debugging messages */
287#define EXT2_MOUNT_ERRORS_CONT 0x000010 /* Continue on errors */
288#define EXT2_MOUNT_ERRORS_RO 0x000020 /* Remount fs ro on errors */
289#define EXT2_MOUNT_ERRORS_PANIC 0x000040 /* Panic on errors */
290#define EXT2_MOUNT_MINIX_DF 0x000080 /* Mimics the Minix statfs */
291#define EXT2_MOUNT_NOBH 0x000100 /* No buffer_heads */
292#define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */
293#define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */
294#define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */
295#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */
296#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
297#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
298#define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
299
300
301#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
302#define set_opt(o, opt) o |= EXT2_MOUNT_##opt
303#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \
304 EXT2_MOUNT_##opt)
305/*
306 * Maximal mount counts between two filesystem checks
307 */
308#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */
309#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */
310
311/*
312 * Behaviour when detecting errors
313 */
314#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */
315#define EXT2_ERRORS_RO 2 /* Remount fs read-only */
316#define EXT2_ERRORS_PANIC 3 /* Panic */
317#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE
318
319/*
320 * Structure of the super block
321 */
322struct ext2_super_block {
323 __le32 s_inodes_count; /* Inodes count */
324 __le32 s_blocks_count; /* Blocks count */
325 __le32 s_r_blocks_count; /* Reserved blocks count */
326 __le32 s_free_blocks_count; /* Free blocks count */
327 __le32 s_free_inodes_count; /* Free inodes count */
328 __le32 s_first_data_block; /* First Data Block */
329 __le32 s_log_block_size; /* Block size */
330 __le32 s_log_frag_size; /* Fragment size */
331 __le32 s_blocks_per_group; /* # Blocks per group */
332 __le32 s_frags_per_group; /* # Fragments per group */
333 __le32 s_inodes_per_group; /* # Inodes per group */
334 __le32 s_mtime; /* Mount time */
335 __le32 s_wtime; /* Write time */
336 __le16 s_mnt_count; /* Mount count */
337 __le16 s_max_mnt_count; /* Maximal mount count */
338 __le16 s_magic; /* Magic signature */
339 __le16 s_state; /* File system state */
340 __le16 s_errors; /* Behaviour when detecting errors */
341 __le16 s_minor_rev_level; /* minor revision level */
342 __le32 s_lastcheck; /* time of last check */
343 __le32 s_checkinterval; /* max. time between checks */
344 __le32 s_creator_os; /* OS */
345 __le32 s_rev_level; /* Revision level */
346 __le16 s_def_resuid; /* Default uid for reserved blocks */
347 __le16 s_def_resgid; /* Default gid for reserved blocks */
348 /*
349 * These fields are for EXT2_DYNAMIC_REV superblocks only.
350 *
351 * Note: the difference between the compatible feature set and
352 * the incompatible feature set is that if there is a bit set
353 * in the incompatible feature set that the kernel doesn't
354 * know about, it should refuse to mount the filesystem.
355 *
356 * e2fsck's requirements are more strict; if it doesn't know
357 * about a feature in either the compatible or incompatible
358 * feature set, it must abort and not try to meddle with
359 * things it doesn't understand...
360 */
361 __le32 s_first_ino; /* First non-reserved inode */
362 __le16 s_inode_size; /* size of inode structure */
363 __le16 s_block_group_nr; /* block group # of this superblock */
364 __le32 s_feature_compat; /* compatible feature set */
365 __le32 s_feature_incompat; /* incompatible feature set */
366 __le32 s_feature_ro_compat; /* readonly-compatible feature set */
367 __u8 s_uuid[16]; /* 128-bit uuid for volume */
368 char s_volume_name[16]; /* volume name */
369 char s_last_mounted[64]; /* directory where last mounted */
370 __le32 s_algorithm_usage_bitmap; /* For compression */
371 /*
372 * Performance hints. Directory preallocation should only
373 * happen if the EXT2_COMPAT_PREALLOC flag is on.
374 */
375 __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
376 __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
377 __u16 s_padding1;
378 /*
379 * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set.
380 */
381 __u8 s_journal_uuid[16]; /* uuid of journal superblock */
382 __u32 s_journal_inum; /* inode number of journal file */
383 __u32 s_journal_dev; /* device number of journal file */
384 __u32 s_last_orphan; /* start of list of inodes to delete */
385 __u32 s_hash_seed[4]; /* HTREE hash seed */
386 __u8 s_def_hash_version; /* Default hash version to use */
387 __u8 s_reserved_char_pad;
388 __u16 s_reserved_word_pad;
389 __le32 s_default_mount_opts;
390 __le32 s_first_meta_bg; /* First metablock block group */
391 __u32 s_reserved[190]; /* Padding to the end of the block */
392};
393
394/*
395 * Codes for operating systems
396 */
397#define EXT2_OS_LINUX 0
398#define EXT2_OS_HURD 1
399#define EXT2_OS_MASIX 2
400#define EXT2_OS_FREEBSD 3
401#define EXT2_OS_LITES 4
402
403/*
404 * Revision levels
405 */
406#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */
407#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */
408
409#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV
410#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV
411
412#define EXT2_GOOD_OLD_INODE_SIZE 128
413
414/*
415 * Feature set definitions
416 */
417
418#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \
419 ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) )
420#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \
421 ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) )
422#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \
423 ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) )
424#define EXT2_SET_COMPAT_FEATURE(sb,mask) \
425 EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask)
426#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask) \
427 EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask)
428#define EXT2_SET_INCOMPAT_FEATURE(sb,mask) \
429 EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask)
430#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask) \
431 EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask)
432#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask) \
433 EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask)
434#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask) \
435 EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask)
436
437#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001
438#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002
439#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004
440#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008
441#define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010
442#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020
443#define EXT2_FEATURE_COMPAT_ANY 0xffffffff
444
445#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
446#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
447#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
448#define EXT2_FEATURE_RO_COMPAT_ANY 0xffffffff
449
450#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001
451#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
452#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004
453#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008
454#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010
455#define EXT2_FEATURE_INCOMPAT_ANY 0xffffffff
456
457#define EXT2_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
458#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
459 EXT2_FEATURE_INCOMPAT_META_BG)
460#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
461 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
462 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
463#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP
464#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP
465
466/*
467 * Default values for user and/or group using reserved blocks
468 */
469#define EXT2_DEF_RESUID 0
470#define EXT2_DEF_RESGID 0
471
472/*
473 * Default mount options
474 */
475#define EXT2_DEFM_DEBUG 0x0001
476#define EXT2_DEFM_BSDGROUPS 0x0002
477#define EXT2_DEFM_XATTR_USER 0x0004
478#define EXT2_DEFM_ACL 0x0008
479#define EXT2_DEFM_UID16 0x0010
480 /* Not used by ext2, but reserved for use by ext3 */
481#define EXT3_DEFM_JMODE 0x0060
482#define EXT3_DEFM_JMODE_DATA 0x0020
483#define EXT3_DEFM_JMODE_ORDERED 0x0040
484#define EXT3_DEFM_JMODE_WBACK 0x0060
485
486/*
487 * Structure of a directory entry
488 */
489#define EXT2_NAME_LEN 255
490
491struct ext2_dir_entry {
492 __le32 inode; /* Inode number */
493 __le16 rec_len; /* Directory entry length */
494 __le16 name_len; /* Name length */
495 char name[EXT2_NAME_LEN]; /* File name */
496};
497
498/*
499 * The new version of the directory entry. Since EXT2 structures are
500 * stored in intel byte order, and the name_len field could never be
501 * bigger than 255 chars, it's safe to reclaim the extra byte for the
502 * file_type field.
503 */
504struct ext2_dir_entry_2 {
505 __le32 inode; /* Inode number */
506 __le16 rec_len; /* Directory entry length */
507 __u8 name_len; /* Name length */
508 __u8 file_type;
509 char name[EXT2_NAME_LEN]; /* File name */
510};
511
512/*
513 * Ext2 directory file types. Only the low 3 bits are used. The
514 * other bits are reserved for now.
515 */
516enum {
517 EXT2_FT_UNKNOWN = 0,
518 EXT2_FT_REG_FILE = 1,
519 EXT2_FT_DIR = 2,
520 EXT2_FT_CHRDEV = 3,
521 EXT2_FT_BLKDEV = 4,
522 EXT2_FT_FIFO = 5,
523 EXT2_FT_SOCK = 6,
524 EXT2_FT_SYMLINK = 7,
525 EXT2_FT_MAX
526};
527
528/*
529 * EXT2_DIR_PAD defines the directory entries boundaries
530 *
531 * NOTE: It must be a multiple of 4
532 */
533#define EXT2_DIR_PAD 4
534#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1)
535#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
536 ~EXT2_DIR_ROUND)
537#define EXT2_MAX_REC_LEN ((1<<16)-1)
538
539#define EXT2_SB_MAGIC_OFFSET 0x38 29#define EXT2_SB_MAGIC_OFFSET 0x38
540#define EXT2_SB_BLOCKS_OFFSET 0x04 30#define EXT2_SB_BLOCKS_OFFSET 0x04
541#define EXT2_SB_BSIZE_OFFSET 0x18 31#define EXT2_SB_BSIZE_OFFSET 0x18
@@ -549,13 +39,4 @@ static inline u64 ext2_image_size(void *ext2_sb)
549 le32_to_cpup((__le32 *)(p + EXT2_SB_BSIZE_OFFSET)); 39 le32_to_cpup((__le32 *)(p + EXT2_SB_BSIZE_OFFSET));
550} 40}
551 41
552static inline void verify_offsets(void)
553{
554#define A(x,y) BUILD_BUG_ON(x != offsetof(struct ext2_super_block, y));
555 A(EXT2_SB_MAGIC_OFFSET, s_magic);
556 A(EXT2_SB_BLOCKS_OFFSET, s_blocks_count);
557 A(EXT2_SB_BSIZE_OFFSET, s_log_block_size);
558#undef A
559}
560
561#endif /* _LINUX_EXT2_FS_H */ 42#endif /* _LINUX_EXT2_FS_H */
diff --git a/include/linux/ext2_fs_sb.h b/include/linux/ext2_fs_sb.h
deleted file mode 100644
index db4d9f586bb6..000000000000
--- a/include/linux/ext2_fs_sb.h
+++ /dev/null
@@ -1,126 +0,0 @@
1/*
2 * linux/include/linux/ext2_fs_sb.h
3 *
4 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr)
6 * Laboratoire MASI - Institut Blaise Pascal
7 * Universite Pierre et Marie Curie (Paris VI)
8 *
9 * from
10 *
11 * linux/include/linux/minix_fs_sb.h
12 *
13 * Copyright (C) 1991, 1992 Linus Torvalds
14 */
15
16#ifndef _LINUX_EXT2_FS_SB
17#define _LINUX_EXT2_FS_SB
18
19#include <linux/blockgroup_lock.h>
20#include <linux/percpu_counter.h>
21#include <linux/rbtree.h>
22
23/* XXX Here for now... not interested in restructing headers JUST now */
24
25/* data type for block offset of block group */
26typedef int ext2_grpblk_t;
27
28/* data type for filesystem-wide blocks number */
29typedef unsigned long ext2_fsblk_t;
30
31#define E2FSBLK "%lu"
32
33struct ext2_reserve_window {
34 ext2_fsblk_t _rsv_start; /* First byte reserved */
35 ext2_fsblk_t _rsv_end; /* Last byte reserved or 0 */
36};
37
38struct ext2_reserve_window_node {
39 struct rb_node rsv_node;
40 __u32 rsv_goal_size;
41 __u32 rsv_alloc_hit;
42 struct ext2_reserve_window rsv_window;
43};
44
45struct ext2_block_alloc_info {
46 /* information about reservation window */
47 struct ext2_reserve_window_node rsv_window_node;
48 /*
49 * was i_next_alloc_block in ext2_inode_info
50 * is the logical (file-relative) number of the
51 * most-recently-allocated block in this file.
52 * We use this for detecting linearly ascending allocation requests.
53 */
54 __u32 last_alloc_logical_block;
55 /*
56 * Was i_next_alloc_goal in ext2_inode_info
57 * is the *physical* companion to i_next_alloc_block.
58 * it the the physical block number of the block which was most-recentl
59 * allocated to this file. This give us the goal (target) for the next
60 * allocation when we detect linearly ascending requests.
61 */
62 ext2_fsblk_t last_alloc_physical_block;
63};
64
65#define rsv_start rsv_window._rsv_start
66#define rsv_end rsv_window._rsv_end
67
68/*
69 * second extended-fs super-block data in memory
70 */
71struct ext2_sb_info {
72 unsigned long s_frag_size; /* Size of a fragment in bytes */
73 unsigned long s_frags_per_block;/* Number of fragments per block */
74 unsigned long s_inodes_per_block;/* Number of inodes per block */
75 unsigned long s_frags_per_group;/* Number of fragments in a group */
76 unsigned long s_blocks_per_group;/* Number of blocks in a group */
77 unsigned long s_inodes_per_group;/* Number of inodes in a group */
78 unsigned long s_itb_per_group; /* Number of inode table blocks per group */
79 unsigned long s_gdb_count; /* Number of group descriptor blocks */
80 unsigned long s_desc_per_block; /* Number of group descriptors per block */
81 unsigned long s_groups_count; /* Number of groups in the fs */
82 unsigned long s_overhead_last; /* Last calculated overhead */
83 unsigned long s_blocks_last; /* Last seen block count */
84 struct buffer_head * s_sbh; /* Buffer containing the super block */
85 struct ext2_super_block * s_es; /* Pointer to the super block in the buffer */
86 struct buffer_head ** s_group_desc;
87 unsigned long s_mount_opt;
88 unsigned long s_sb_block;
89 uid_t s_resuid;
90 gid_t s_resgid;
91 unsigned short s_mount_state;
92 unsigned short s_pad;
93 int s_addr_per_block_bits;
94 int s_desc_per_block_bits;
95 int s_inode_size;
96 int s_first_ino;
97 spinlock_t s_next_gen_lock;
98 u32 s_next_generation;
99 unsigned long s_dir_count;
100 u8 *s_debts;
101 struct percpu_counter s_freeblocks_counter;
102 struct percpu_counter s_freeinodes_counter;
103 struct percpu_counter s_dirs_counter;
104 struct blockgroup_lock *s_blockgroup_lock;
105 /* root of the per fs reservation window tree */
106 spinlock_t s_rsv_window_lock;
107 struct rb_root s_rsv_window_root;
108 struct ext2_reserve_window_node s_rsv_window_head;
109 /*
110 * s_lock protects against concurrent modifications of s_mount_state,
111 * s_blocks_last, s_overhead_last and the content of superblock's
112 * buffer pointed to by sbi->s_es.
113 *
114 * Note: It is used in ext2_show_options() to provide a consistent view
115 * of the mount options.
116 */
117 spinlock_t s_lock;
118};
119
120static inline spinlock_t *
121sb_bgl_lock(struct ext2_sb_info *sbi, unsigned int block_group)
122{
123 return bgl_lock_ptr(sbi->s_blockgroup_lock, block_group);
124}
125
126#endif /* _LINUX_EXT2_FS_SB */