aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/ext4/ext4.h122
-rw-r--r--fs/ext4/ext4_i.h140
2 files changed, 121 insertions, 141 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 02ec44bf38e6..ba57d669cb65 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -21,7 +21,10 @@
21#include <linux/magic.h> 21#include <linux/magic.h>
22#include <linux/jbd2.h> 22#include <linux/jbd2.h>
23#include <linux/quota.h> 23#include <linux/quota.h>
24#include "ext4_i.h" 24#include <linux/rwsem.h>
25#include <linux/rbtree.h>
26#include <linux/seqlock.h>
27#include <linux/mutex.h>
25 28
26/* 29/*
27 * The fourth extended filesystem constants/structures 30 * The fourth extended filesystem constants/structures
@@ -46,6 +49,19 @@
46#define ext4_debug(f, a...) do {} while (0) 49#define ext4_debug(f, a...) do {} while (0)
47#endif 50#endif
48 51
52/* data type for block offset of block group */
53typedef int ext4_grpblk_t;
54
55/* data type for filesystem-wide blocks number */
56typedef unsigned long long ext4_fsblk_t;
57
58/* data type for file logical block number */
59typedef __u32 ext4_lblk_t;
60
61/* data type for block group number */
62typedef unsigned int ext4_group_t;
63
64
49/* prefer goal again. length */ 65/* prefer goal again. length */
50#define EXT4_MB_HINT_MERGE 1 66#define EXT4_MB_HINT_MERGE 1
51/* blocks already reserved */ 67/* blocks already reserved */
@@ -516,6 +532,110 @@ do { \
516#endif /* defined(__KERNEL__) || defined(__linux__) */ 532#endif /* defined(__KERNEL__) || defined(__linux__) */
517 533
518/* 534/*
535 * storage for cached extent
536 */
537struct ext4_ext_cache {
538 ext4_fsblk_t ec_start;
539 ext4_lblk_t ec_block;
540 __u32 ec_len; /* must be 32bit to return holes */
541 __u32 ec_type;
542};
543
544/*
545 * fourth extended file system inode data in memory
546 */
547struct ext4_inode_info {
548 __le32 i_data[15]; /* unconverted */
549 __u32 i_flags;
550 ext4_fsblk_t i_file_acl;
551 __u32 i_dtime;
552
553 /*
554 * i_block_group is the number of the block group which contains
555 * this file's inode. Constant across the lifetime of the inode,
556 * it is ued for making block allocation decisions - we try to
557 * place a file's data blocks near its inode block, and new inodes
558 * near to their parent directory's inode.
559 */
560 ext4_group_t i_block_group;
561 __u32 i_state; /* Dynamic state flags for ext4 */
562
563 ext4_lblk_t i_dir_start_lookup;
564#ifdef CONFIG_EXT4_FS_XATTR
565 /*
566 * Extended attributes can be read independently of the main file
567 * data. Taking i_mutex even when reading would cause contention
568 * between readers of EAs and writers of regular file data, so
569 * instead we synchronize on xattr_sem when reading or changing
570 * EAs.
571 */
572 struct rw_semaphore xattr_sem;
573#endif
574#ifdef CONFIG_EXT4_FS_POSIX_ACL
575 struct posix_acl *i_acl;
576 struct posix_acl *i_default_acl;
577#endif
578
579 struct list_head i_orphan; /* unlinked but open inodes */
580
581 /*
582 * i_disksize keeps track of what the inode size is ON DISK, not
583 * in memory. During truncate, i_size is set to the new size by
584 * the VFS prior to calling ext4_truncate(), but the filesystem won't
585 * set i_disksize to 0 until the truncate is actually under way.
586 *
587 * The intent is that i_disksize always represents the blocks which
588 * are used by this file. This allows recovery to restart truncate
589 * on orphans if we crash during truncate. We actually write i_disksize
590 * into the on-disk inode when writing inodes out, instead of i_size.
591 *
592 * The only time when i_disksize and i_size may be different is when
593 * a truncate is in progress. The only things which change i_disksize
594 * are ext4_get_block (growth) and ext4_truncate (shrinkth).
595 */
596 loff_t i_disksize;
597
598 /*
599 * i_data_sem is for serialising ext4_truncate() against
600 * ext4_getblock(). In the 2.4 ext2 design, great chunks of inode's
601 * data tree are chopped off during truncate. We can't do that in
602 * ext4 because whenever we perform intermediate commits during
603 * truncate, the inode and all the metadata blocks *must* be in a
604 * consistent state which allows truncation of the orphans to restart
605 * during recovery. Hence we must fix the get_block-vs-truncate race
606 * by other means, so we have i_data_sem.
607 */
608 struct rw_semaphore i_data_sem;
609 struct inode vfs_inode;
610 struct jbd2_inode jinode;
611
612 struct ext4_ext_cache i_cached_extent;
613 /*
614 * File creation time. Its function is same as that of
615 * struct timespec i_{a,c,m}time in the generic inode.
616 */
617 struct timespec i_crtime;
618
619 /* mballoc */
620 struct list_head i_prealloc_list;
621 spinlock_t i_prealloc_lock;
622
623 /* ialloc */
624 ext4_group_t i_last_alloc_group;
625
626 /* allocation reservation info for delalloc */
627 unsigned int i_reserved_data_blocks;
628 unsigned int i_reserved_meta_blocks;
629 unsigned int i_allocated_meta_blocks;
630 unsigned short i_delalloc_reserved_flag;
631
632 /* on-disk additional length */
633 __u16 i_extra_isize;
634
635 spinlock_t i_block_reservation_lock;
636};
637
638/*
519 * File system states 639 * File system states
520 */ 640 */
521#define EXT4_VALID_FS 0x0001 /* Unmounted cleanly */ 641#define EXT4_VALID_FS 0x0001 /* Unmounted cleanly */
diff --git a/fs/ext4/ext4_i.h b/fs/ext4/ext4_i.h
deleted file mode 100644
index 4ce2187123aa..000000000000
--- a/fs/ext4/ext4_i.h
+++ /dev/null
@@ -1,140 +0,0 @@
1/*
2 * ext4_i.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_i.h
12 *
13 * Copyright (C) 1991, 1992 Linus Torvalds
14 */
15
16#ifndef _EXT4_I
17#define _EXT4_I
18
19#include <linux/rwsem.h>
20#include <linux/rbtree.h>
21#include <linux/seqlock.h>
22#include <linux/mutex.h>
23
24/* data type for block offset of block group */
25typedef int ext4_grpblk_t;
26
27/* data type for filesystem-wide blocks number */
28typedef unsigned long long ext4_fsblk_t;
29
30/* data type for file logical block number */
31typedef __u32 ext4_lblk_t;
32
33/* data type for block group number */
34typedef unsigned int ext4_group_t;
35
36/*
37 * storage for cached extent
38 */
39struct ext4_ext_cache {
40 ext4_fsblk_t ec_start;
41 ext4_lblk_t ec_block;
42 __u32 ec_len; /* must be 32bit to return holes */
43 __u32 ec_type;
44};
45
46/*
47 * fourth extended file system inode data in memory
48 */
49struct ext4_inode_info {
50 __le32 i_data[15]; /* unconverted */
51 __u32 i_flags;
52 ext4_fsblk_t i_file_acl;
53 __u32 i_dtime;
54
55 /*
56 * i_block_group is the number of the block group which contains
57 * this file's inode. Constant across the lifetime of the inode,
58 * it is ued for making block allocation decisions - we try to
59 * place a file's data blocks near its inode block, and new inodes
60 * near to their parent directory's inode.
61 */
62 ext4_group_t i_block_group;
63 __u32 i_state; /* Dynamic state flags for ext4 */
64
65 ext4_lblk_t i_dir_start_lookup;
66#ifdef CONFIG_EXT4_FS_XATTR
67 /*
68 * Extended attributes can be read independently of the main file
69 * data. Taking i_mutex even when reading would cause contention
70 * between readers of EAs and writers of regular file data, so
71 * instead we synchronize on xattr_sem when reading or changing
72 * EAs.
73 */
74 struct rw_semaphore xattr_sem;
75#endif
76#ifdef CONFIG_EXT4_FS_POSIX_ACL
77 struct posix_acl *i_acl;
78 struct posix_acl *i_default_acl;
79#endif
80
81 struct list_head i_orphan; /* unlinked but open inodes */
82
83 /*
84 * i_disksize keeps track of what the inode size is ON DISK, not
85 * in memory. During truncate, i_size is set to the new size by
86 * the VFS prior to calling ext4_truncate(), but the filesystem won't
87 * set i_disksize to 0 until the truncate is actually under way.
88 *
89 * The intent is that i_disksize always represents the blocks which
90 * are used by this file. This allows recovery to restart truncate
91 * on orphans if we crash during truncate. We actually write i_disksize
92 * into the on-disk inode when writing inodes out, instead of i_size.
93 *
94 * The only time when i_disksize and i_size may be different is when
95 * a truncate is in progress. The only things which change i_disksize
96 * are ext4_get_block (growth) and ext4_truncate (shrinkth).
97 */
98 loff_t i_disksize;
99
100 /*
101 * i_data_sem is for serialising ext4_truncate() against
102 * ext4_getblock(). In the 2.4 ext2 design, great chunks of inode's
103 * data tree are chopped off during truncate. We can't do that in
104 * ext4 because whenever we perform intermediate commits during
105 * truncate, the inode and all the metadata blocks *must* be in a
106 * consistent state which allows truncation of the orphans to restart
107 * during recovery. Hence we must fix the get_block-vs-truncate race
108 * by other means, so we have i_data_sem.
109 */
110 struct rw_semaphore i_data_sem;
111 struct inode vfs_inode;
112 struct jbd2_inode jinode;
113
114 struct ext4_ext_cache i_cached_extent;
115 /*
116 * File creation time. Its function is same as that of
117 * struct timespec i_{a,c,m}time in the generic inode.
118 */
119 struct timespec i_crtime;
120
121 /* mballoc */
122 struct list_head i_prealloc_list;
123 spinlock_t i_prealloc_lock;
124
125 /* ialloc */
126 ext4_group_t i_last_alloc_group;
127
128 /* allocation reservation info for delalloc */
129 unsigned int i_reserved_data_blocks;
130 unsigned int i_reserved_meta_blocks;
131 unsigned int i_allocated_meta_blocks;
132 unsigned short i_delalloc_reserved_flag;
133
134 /* on-disk additional length */
135 __u16 i_extra_isize;
136
137 spinlock_t i_block_reservation_lock;
138};
139
140#endif /* _EXT4_I */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-12 13:29:02 -0500