aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 16:42:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 16:42:57 -0400
commit8bb1f229527dee95644e0f8496980bb767c6f620 (patch)
tree511551e9772f11f855bd5b759b6d449da47e8820
parentf22e08a79f3765fecf060b225a46931c94fb0a92 (diff)
parentc0d0259481cc6ec2a38cad810055e455de35c733 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull second try at vfs part d#2 from Al Viro: "Miklos' first series (with do_lookup() rewrite split into edible chunks) + assorted bits and pieces. The 'untangling of do_lookup()' series is is a splitup of what used to be a monolithic patch from Miklos, so this series is basically "how do I convince myself that his patch is correct (or find a hole in it)". No holes found and I like the resulting cleanup, so in it went..." Changes from try 1: Fix a boot problem with selinux, and commit messages prettied up a bit. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (24 commits) vfs: fix out-of-date dentry_unhash() comment vfs: split __lookup_hash untangling do_lookup() - take __lookup_hash()-calling case out of line. untangling do_lookup() - switch to calling __lookup_hash() untangling do_lookup() - merge d_alloc_and_lookup() callers untangling do_lookup() - merge failure exits in !dentry case untangling do_lookup() - massage !dentry case towards __lookup_hash() untangling do_lookup() - get rid of need_reval in !dentry case untangling do_lookup() - eliminate a loop. untangling do_lookup() - expand the area under ->i_mutex untangling do_lookup() - isolate !dentry stuff from the rest of it. vfs: move MAY_EXEC check from __lookup_hash() vfs: don't revalidate just looked up dentry vfs: fix d_need_lookup/d_revalidate order in do_lookup ext3: move headers to fs/ext3/ migrate ext2_fs.h guts to fs/ext2/ext2.h new helper: ext2_image_size() get rid of pointless includes of ext2_fs.h ext2: No longer export ext2_fs.h to user space mtdchar: kill persistently held vfsmount ...
Diffstat
-rw-r--r--arch/blackfin/kernel/setup.c7
-rw-r--r--drivers/mtd/mtdchar.c53
-rw-r--r--fs/aio.c32
-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--fs/ext3/acl.c8
-rw-r--r--fs/ext3/balloc.c10
-rw-r--r--fs/ext3/bitmap.c4
-rw-r--r--fs/ext3/dir.c7
-rw-r--r--fs/ext3/ext3.h (renamed from include/linux/ext3_fs.h)488
-rw-r--r--fs/ext3/ext3_jbd.c2
-rw-r--r--fs/ext3/file.c6
-rw-r--r--fs/ext3/fsync.c8
-rw-r--r--fs/ext3/hash.c4
-rw-r--r--fs/ext3/ialloc.c13
-rw-r--r--fs/ext3/inode.c12
-rw-r--r--fs/ext3/ioctl.c7
-rw-r--r--fs/ext3/namei.c14
-rw-r--r--fs/ext3/resize.c5
-rw-r--r--fs/ext3/super.c18
-rw-r--r--fs/ext3/symlink.c4
-rw-r--r--fs/ext3/xattr.c7
-rw-r--r--fs/ext3/xattr_security.c6
-rw-r--r--fs/ext3/xattr_trusted.c6
-rw-r--r--fs/ext3/xattr_user.c5
-rw-r--r--fs/gfs2/file.c1
-rw-r--r--fs/namei.c195
-rw-r--r--fs/ocfs2/ioctl.c2
-rw-r--r--fs/pstore/inode.c26
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/ext2_fs.h569
-rw-r--r--include/linux/ext2_fs_sb.h126
-rw-r--r--include/linux/ext3_fs_i.h151
-rw-r--r--include/linux/ext3_fs_sb.h91
-rw-r--r--include/linux/ext3_jbd.h229
-rw-r--r--init/do_mounts_initrd.c1
-rw-r--r--init/do_mounts_rd.c9
-rw-r--r--security/selinux/hooks.c9
-rw-r--r--security/selinux/selinuxfs.c110
41 files changed, 1249 insertions, 1640 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 2aa019368504..2ad747e909fb 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -550,6 +550,7 @@ static __init void memory_setup(void)
550{ 550{
551#ifdef CONFIG_MTD_UCLINUX 551#ifdef CONFIG_MTD_UCLINUX
552 unsigned long mtd_phys = 0; 552 unsigned long mtd_phys = 0;
553 unsigned long n;
553#endif 554#endif
554 unsigned long max_mem; 555 unsigned long max_mem;
555 556
@@ -593,9 +594,9 @@ static __init void memory_setup(void)
593 mtd_size = PAGE_ALIGN(*((unsigned long *)(mtd_phys + 8))); 594 mtd_size = PAGE_ALIGN(*((unsigned long *)(mtd_phys + 8)));
594 595
595# if defined(CONFIG_EXT2_FS) || defined(CONFIG_EXT3_FS) 596# if defined(CONFIG_EXT2_FS) || defined(CONFIG_EXT3_FS)
596 if (*((unsigned short *)(mtd_phys + 0x438)) == EXT2_SUPER_MAGIC) 597 n = ext2_image_size((void *)(mtd_phys + 0x400));
597 mtd_size = 598 if (n)
598 PAGE_ALIGN(*((unsigned long *)(mtd_phys + 0x404)) << 10); 599 mtd_size = PAGE_ALIGN(n * 1024);
599# endif 600# endif
600 601
601# if defined(CONFIG_CRAMFS) 602# if defined(CONFIG_CRAMFS)
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 55d82321d307..94eb05b1afdf 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -39,7 +39,6 @@
39#include <asm/uaccess.h> 39#include <asm/uaccess.h>
40 40
41static DEFINE_MUTEX(mtd_mutex); 41static DEFINE_MUTEX(mtd_mutex);
42static struct vfsmount *mtd_inode_mnt __read_mostly;
43 42
44/* 43/*
45 * Data structure to hold the pointer to the mtd device as well 44 * Data structure to hold the pointer to the mtd device as well
@@ -75,7 +74,9 @@ static loff_t mtdchar_lseek(struct file *file, loff_t offset, int orig)
75 return -EINVAL; 74 return -EINVAL;
76} 75}
77 76
78 77static int count;
78static struct vfsmount *mnt;
79static struct file_system_type mtd_inodefs_type;
79 80
80static int mtdchar_open(struct inode *inode, struct file *file) 81static int mtdchar_open(struct inode *inode, struct file *file)
81{ 82{
@@ -92,6 +93,10 @@ static int mtdchar_open(struct inode *inode, struct file *file)
92 if ((file->f_mode & FMODE_WRITE) && (minor & 1)) 93 if ((file->f_mode & FMODE_WRITE) && (minor & 1))
93 return -EACCES; 94 return -EACCES;
94 95
96 ret = simple_pin_fs(&mtd_inodefs_type, &mnt, &count);
97 if (ret)
98 return ret;
99
95 mutex_lock(&mtd_mutex); 100 mutex_lock(&mtd_mutex);
96 mtd = get_mtd_device(NULL, devnum); 101 mtd = get_mtd_device(NULL, devnum);
97 102
@@ -106,7 +111,7 @@ static int mtdchar_open(struct inode *inode, struct file *file)
106 goto out; 111 goto out;
107 } 112 }
108 113
109 mtd_ino = iget_locked(mtd_inode_mnt->mnt_sb, devnum); 114 mtd_ino = iget_locked(mnt->mnt_sb, devnum);
110 if (!mtd_ino) { 115 if (!mtd_ino) {
111 put_mtd_device(mtd); 116 put_mtd_device(mtd);
112 ret = -ENOMEM; 117 ret = -ENOMEM;
@@ -141,6 +146,7 @@ static int mtdchar_open(struct inode *inode, struct file *file)
141 146
142out: 147out:
143 mutex_unlock(&mtd_mutex); 148 mutex_unlock(&mtd_mutex);
149 simple_release_fs(&mnt, &count);
144 return ret; 150 return ret;
145} /* mtdchar_open */ 151} /* mtdchar_open */
146 152
@@ -162,6 +168,7 @@ static int mtdchar_close(struct inode *inode, struct file *file)
162 put_mtd_device(mtd); 168 put_mtd_device(mtd);
163 file->private_data = NULL; 169 file->private_data = NULL;
164 kfree(mfi); 170 kfree(mfi);
171 simple_release_fs(&mnt, &count);
165 172
166 return 0; 173 return 0;
167} /* mtdchar_close */ 174} /* mtdchar_close */
@@ -1175,10 +1182,15 @@ static const struct file_operations mtd_fops = {
1175#endif 1182#endif
1176}; 1183};
1177 1184
1185static const struct super_operations mtd_ops = {
1186 .drop_inode = generic_delete_inode,
1187 .statfs = simple_statfs,
1188};
1189
1178static struct dentry *mtd_inodefs_mount(struct file_system_type *fs_type, 1190static struct dentry *mtd_inodefs_mount(struct file_system_type *fs_type,
1179 int flags, const char *dev_name, void *data) 1191 int flags, const char *dev_name, void *data)
1180{ 1192{
1181 return mount_pseudo(fs_type, "mtd_inode:", NULL, NULL, MTD_INODE_FS_MAGIC); 1193 return mount_pseudo(fs_type, "mtd_inode:", &mtd_ops, NULL, MTD_INODE_FS_MAGIC);
1182} 1194}
1183 1195
1184static struct file_system_type mtd_inodefs_type = { 1196static struct file_system_type mtd_inodefs_type = {
@@ -1187,26 +1199,6 @@ static struct file_system_type mtd_inodefs_type = {
1187 .kill_sb = kill_anon_super, 1199 .kill_sb = kill_anon_super,
1188}; 1200};
1189 1201
1190static void mtdchar_notify_add(struct mtd_info *mtd)
1191{
1192}
1193
1194static void mtdchar_notify_remove(struct mtd_info *mtd)
1195{
1196 struct inode *mtd_ino = ilookup(mtd_inode_mnt->mnt_sb, mtd->index);
1197
1198 if (mtd_ino) {
1199 /* Destroy the inode if it exists */
1200 clear_nlink(mtd_ino);
1201 iput(mtd_ino);
1202 }
1203}
1204
1205static struct mtd_notifier mtdchar_notifier = {
1206 .add = mtdchar_notify_add,
1207 .remove = mtdchar_notify_remove,
1208};
1209
1210static int __init init_mtdchar(void) 1202static int __init init_mtdchar(void)
1211{ 1203{
1212 int ret; 1204 int ret;
@@ -1224,19 +1216,8 @@ static int __init init_mtdchar(void)
1224 pr_notice("Can't register mtd_inodefs filesystem: %d\n", ret); 1216 pr_notice("Can't register mtd_inodefs filesystem: %d\n", ret);
1225 goto err_unregister_chdev; 1217 goto err_unregister_chdev;
1226 } 1218 }
1227
1228 mtd_inode_mnt = kern_mount(&mtd_inodefs_type);
1229 if (IS_ERR(mtd_inode_mnt)) {
1230 ret = PTR_ERR(mtd_inode_mnt);
1231 pr_notice("Error mounting mtd_inodefs filesystem: %d\n", ret);
1232 goto err_unregister_filesystem;
1233 }
1234 register_mtd_user(&mtdchar_notifier);
1235
1236 return ret; 1219 return ret;
1237 1220
1238err_unregister_filesystem:
1239 unregister_filesystem(&mtd_inodefs_type);
1240err_unregister_chdev: 1221err_unregister_chdev:
1241 __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd"); 1222 __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
1242 return ret; 1223 return ret;
@@ -1244,8 +1225,6 @@ err_unregister_chdev:
1244 1225
1245static void __exit cleanup_mtdchar(void) 1226static void __exit cleanup_mtdchar(void)
1246{ 1227{
1247 unregister_mtd_user(&mtdchar_notifier);
1248 kern_unmount(mtd_inode_mnt);
1249 unregister_filesystem(&mtd_inodefs_type); 1228 unregister_filesystem(&mtd_inodefs_type);
1250 __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd"); 1229 __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
1251} 1230}
diff --git a/fs/aio.c b/fs/aio.c
index 4f71627264fd..da887604dfc5 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -305,15 +305,18 @@ out_freectx:
305 return ERR_PTR(err); 305 return ERR_PTR(err);
306} 306}
307 307
308/* aio_cancel_all 308/* kill_ctx
309 * Cancels all outstanding aio requests on an aio context. Used 309 * Cancels all outstanding aio requests on an aio context. Used
310 * when the processes owning a context have all exited to encourage 310 * when the processes owning a context have all exited to encourage
311 * the rapid destruction of the kioctx. 311 * the rapid destruction of the kioctx.
312 */ 312 */
313static void aio_cancel_all(struct kioctx *ctx) 313static void kill_ctx(struct kioctx *ctx)
314{ 314{
315 int (*cancel)(struct kiocb *, struct io_event *); 315 int (*cancel)(struct kiocb *, struct io_event *);
316 struct task_struct *tsk = current;
317 DECLARE_WAITQUEUE(wait, tsk);
316 struct io_event res; 318 struct io_event res;
319
317 spin_lock_irq(&ctx->ctx_lock); 320 spin_lock_irq(&ctx->ctx_lock);
318 ctx->dead = 1; 321 ctx->dead = 1;
319 while (!list_empty(&ctx->active_reqs)) { 322 while (!list_empty(&ctx->active_reqs)) {
@@ -329,15 +332,7 @@ static void aio_cancel_all(struct kioctx *ctx)
329 spin_lock_irq(&ctx->ctx_lock); 332 spin_lock_irq(&ctx->ctx_lock);
330 } 333 }
331 } 334 }
332 spin_unlock_irq(&ctx->ctx_lock);
333}
334
335static void wait_for_all_aios(struct kioctx *ctx)
336{
337 struct task_struct *tsk = current;
338 DECLARE_WAITQUEUE(wait, tsk);
339 335
340 spin_lock_irq(&ctx->ctx_lock);
341 if (!ctx->reqs_active) 336 if (!ctx->reqs_active)
342 goto out; 337 goto out;
343 338
@@ -387,9 +382,7 @@ void exit_aio(struct mm_struct *mm)
387 ctx = hlist_entry(mm->ioctx_list.first, struct kioctx, list); 382 ctx = hlist_entry(mm->ioctx_list.first, struct kioctx, list);
388 hlist_del_rcu(&ctx->list); 383 hlist_del_rcu(&ctx->list);
389 384
390 aio_cancel_all(ctx); 385 kill_ctx(ctx);
391
392 wait_for_all_aios(ctx);
393 386
394 if (1 != atomic_read(&ctx->users)) 387 if (1 != atomic_read(&ctx->users))
395 printk(KERN_DEBUG 388 printk(KERN_DEBUG
@@ -1269,8 +1262,7 @@ static void io_destroy(struct kioctx *ioctx)
1269 if (likely(!was_dead)) 1262 if (likely(!was_dead))
1270 put_ioctx(ioctx); /* twice for the list */ 1263 put_ioctx(ioctx); /* twice for the list */
1271 1264
1272 aio_cancel_all(ioctx); 1265 kill_ctx(ioctx);
1273 wait_for_all_aios(ioctx);
1274 1266
1275 /* 1267 /*
1276 * Wake up any waiters. The setting of ctx->dead must be seen 1268 * Wake up any waiters. The setting of ctx->dead must be seen
@@ -1278,7 +1270,6 @@ static void io_destroy(struct kioctx *ioctx)
1278 * locking done by the above calls to ensure this consistency. 1270 * locking done by the above calls to ensure this consistency.
1279 */ 1271 */
1280 wake_up_all(&ioctx->wait); 1272 wake_up_all(&ioctx->wait);
1281 put_ioctx(ioctx); /* once for the lookup */
1282} 1273}
1283 1274
1284/* sys_io_setup: 1275/* sys_io_setup:
@@ -1315,11 +1306,9 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp)
1315 ret = PTR_ERR(ioctx); 1306 ret = PTR_ERR(ioctx);
1316 if (!IS_ERR(ioctx)) { 1307 if (!IS_ERR(ioctx)) {
1317 ret = put_user(ioctx->user_id, ctxp); 1308 ret = put_user(ioctx->user_id, ctxp);
1318 if (!ret) { 1309 if (ret)
1319 put_ioctx(ioctx); 1310 io_destroy(ioctx);
1320 return 0; 1311 put_ioctx(ioctx);
1321 }
1322 io_destroy(ioctx);
1323 } 1312 }
1324 1313
1325out: 1314out:
@@ -1337,6 +1326,7 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
1337 struct kioctx *ioctx = lookup_ioctx(ctx); 1326 struct kioctx *ioctx = lookup_ioctx(ctx);
1338 if (likely(NULL != ioctx)) { 1327 if (likely(NULL != ioctx)) {
1339 io_destroy(ioctx); 1328 io_destroy(ioctx);
1329 put_ioctx(ioctx);
1340 return 0; 1330 return 0;
1341 } 1331 }
1342 pr_debug("EINVAL: io_destroy: invalid context id\n"); 1332 pr_debug("EINVAL: io_destroy: invalid context id\n");
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/fs/ext3/acl.c b/fs/ext3/acl.c
index 3091f62e55b6..c76832c8d192 100644
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -4,13 +4,7 @@
4 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de> 4 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de>
5 */ 5 */
6 6
7#include <linux/init.h> 7#include "ext3.h"
8#include <linux/sched.h>
9#include <linux/slab.h>
10#include <linux/capability.h>
11#include <linux/fs.h>
12#include <linux/ext3_jbd.h>
13#include <linux/ext3_fs.h>
14#include "xattr.h" 8#include "xattr.h"
15#include "acl.h" 9#include "acl.h"
16 10
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 1e036b79384c..baac1b129fba 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -11,17 +11,9 @@
11 * David S. Miller (davem@caip.rutgers.edu), 1995 11 * David S. Miller (davem@caip.rutgers.edu), 1995
12 */ 12 */
13 13
14#include <linux/time.h>
15#include <linux/capability.h>
16#include <linux/fs.h>
17#include <linux/slab.h>
18#include <linux/jbd.h>
19#include <linux/ext3_fs.h>
20#include <linux/ext3_jbd.h>
21#include <linux/quotaops.h> 14#include <linux/quotaops.h>
22#include <linux/buffer_head.h>
23#include <linux/blkdev.h> 15#include <linux/blkdev.h>
24#include <trace/events/ext3.h> 16#include "ext3.h"
25 17
26/* 18/*
27 * balloc.c contains the blocks allocation and deallocation routines 19 * balloc.c contains the blocks allocation and deallocation routines
diff --git a/fs/ext3/bitmap.c b/fs/ext3/bitmap.c
index 6afc39d80253..909d13e26560 100644
--- a/fs/ext3/bitmap.c
+++ b/fs/ext3/bitmap.c
@@ -7,9 +7,7 @@
7 * Universite Pierre et Marie Curie (Paris VI) 7 * Universite Pierre et Marie Curie (Paris VI)
8 */ 8 */
9 9
10#include <linux/buffer_head.h> 10#include "ext3.h"
11#include <linux/jbd.h>
12#include <linux/ext3_fs.h>
13 11
14#ifdef EXT3FS_DEBUG 12#ifdef EXT3FS_DEBUG
15 13
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 34f0a072b935..cc761ad8fa57 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -21,12 +21,7 @@
21 * 21 *
22 */ 22 */
23 23
24#include <linux/fs.h> 24#include "ext3.h"
25#include <linux/jbd.h>
26#include <linux/ext3_fs.h>
27#include <linux/buffer_head.h>
28#include <linux/slab.h>
29#include <linux/rbtree.h>
30 25
31static unsigned char ext3_filetype_table[] = { 26static unsigned char ext3_filetype_table[] = {
32 DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK 27 DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
diff --git a/include/linux/ext3_fs.h b/fs/ext3/ext3.h
index f5a84eef6ed2..b6515fd7e56c 100644
--- a/include/linux/ext3_fs.h
+++ b/fs/ext3/ext3.h
@@ -1,5 +1,11 @@
1/* 1/*
2 * linux/include/linux/ext3_fs.h 2 * Written by Stephen C. Tweedie <sct@redhat.com>, 1999
3 *
4 * Copyright 1998--1999 Red Hat corp --- All Rights Reserved
5 *
6 * This file is part of the Linux kernel and is made available under
7 * the terms of the GNU General Public License, version 2, or at your
8 * option, any later version, incorporated herein by reference.
3 * 9 *
4 * Copyright (C) 1992, 1993, 1994, 1995 10 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr) 11 * Remy Card (card@masi.ibp.fr)
@@ -13,12 +19,11 @@
13 * Copyright (C) 1991, 1992 Linus Torvalds 19 * Copyright (C) 1991, 1992 Linus Torvalds
14 */ 20 */
15 21
16#ifndef _LINUX_EXT3_FS_H 22#include <linux/fs.h>
17#define _LINUX_EXT3_FS_H 23#include <linux/jbd.h>
18
19#include <linux/types.h>
20#include <linux/magic.h> 24#include <linux/magic.h>
21#include <linux/bug.h> 25#include <linux/bug.h>
26#include <linux/blockgroup_lock.h>
22 27
23/* 28/*
24 * The second extended filesystem constants/structures 29 * The second extended filesystem constants/structures
@@ -75,29 +80,12 @@
75#define EXT3_MIN_BLOCK_SIZE 1024 80#define EXT3_MIN_BLOCK_SIZE 1024
76#define EXT3_MAX_BLOCK_SIZE 65536 81#define EXT3_MAX_BLOCK_SIZE 65536
77#define EXT3_MIN_BLOCK_LOG_SIZE 10 82#define EXT3_MIN_BLOCK_LOG_SIZE 10
78#ifdef __KERNEL__ 83#define EXT3_BLOCK_SIZE(s) ((s)->s_blocksize)
79# define EXT3_BLOCK_SIZE(s) ((s)->s_blocksize)
80#else
81# define EXT3_BLOCK_SIZE(s) (EXT3_MIN_BLOCK_SIZE << (s)->s_log_block_size)
82#endif
83#define EXT3_ADDR_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / sizeof (__u32)) 84#define EXT3_ADDR_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / sizeof (__u32))
84#ifdef __KERNEL__ 85#define EXT3_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits)
85# define EXT3_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits)
86#else
87# define EXT3_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10)
88#endif
89#ifdef __KERNEL__
90#define EXT3_ADDR_PER_BLOCK_BITS(s) (EXT3_SB(s)->s_addr_per_block_bits) 86#define EXT3_ADDR_PER_BLOCK_BITS(s) (EXT3_SB(s)->s_addr_per_block_bits)
91#define EXT3_INODE_SIZE(s) (EXT3_SB(s)->s_inode_size) 87#define EXT3_INODE_SIZE(s) (EXT3_SB(s)->s_inode_size)
92#define EXT3_FIRST_INO(s) (EXT3_SB(s)->s_first_ino) 88#define EXT3_FIRST_INO(s) (EXT3_SB(s)->s_first_ino)
93#else
94#define EXT3_INODE_SIZE(s) (((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? \
95 EXT3_GOOD_OLD_INODE_SIZE : \
96 (s)->s_inode_size)
97#define EXT3_FIRST_INO(s) (((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? \
98 EXT3_GOOD_OLD_FIRST_INO : \
99 (s)->s_first_ino)
100#endif
101 89
102/* 90/*
103 * Macro-instructions used to manage fragments 91 * Macro-instructions used to manage fragments
@@ -105,13 +93,8 @@
105#define EXT3_MIN_FRAG_SIZE 1024 93#define EXT3_MIN_FRAG_SIZE 1024
106#define EXT3_MAX_FRAG_SIZE 4096 94#define EXT3_MAX_FRAG_SIZE 4096
107#define EXT3_MIN_FRAG_LOG_SIZE 10 95#define EXT3_MIN_FRAG_LOG_SIZE 10
108#ifdef __KERNEL__ 96#define EXT3_FRAG_SIZE(s) (EXT3_SB(s)->s_frag_size)
109# define EXT3_FRAG_SIZE(s) (EXT3_SB(s)->s_frag_size) 97#define EXT3_FRAGS_PER_BLOCK(s) (EXT3_SB(s)->s_frags_per_block)
110# define EXT3_FRAGS_PER_BLOCK(s) (EXT3_SB(s)->s_frags_per_block)
111#else
112# define EXT3_FRAG_SIZE(s) (EXT3_MIN_FRAG_SIZE << (s)->s_log_frag_size)
113# define EXT3_FRAGS_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / EXT3_FRAG_SIZE(s))
114#endif
115 98
116/* 99/*
117 * Structure of a blocks group descriptor 100 * Structure of a blocks group descriptor
@@ -131,16 +114,10 @@ struct ext3_group_desc
131/* 114/*
132 * Macro-instructions used to manage group descriptors 115 * Macro-instructions used to manage group descriptors
133 */ 116 */
134#ifdef __KERNEL__ 117#define EXT3_BLOCKS_PER_GROUP(s) (EXT3_SB(s)->s_blocks_per_group)
135# define EXT3_BLOCKS_PER_GROUP(s) (EXT3_SB(s)->s_blocks_per_group) 118#define EXT3_DESC_PER_BLOCK(s) (EXT3_SB(s)->s_desc_per_block)
136# define EXT3_DESC_PER_BLOCK(s) (EXT3_SB(s)->s_desc_per_block) 119#define EXT3_INODES_PER_GROUP(s) (EXT3_SB(s)->s_inodes_per_group)
137# define EXT3_INODES_PER_GROUP(s) (EXT3_SB(s)->s_inodes_per_group) 120#define EXT3_DESC_PER_BLOCK_BITS(s) (EXT3_SB(s)->s_desc_per_block_bits)
138# define EXT3_DESC_PER_BLOCK_BITS(s) (EXT3_SB(s)->s_desc_per_block_bits)
139#else
140# define EXT3_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group)
141# define EXT3_DESC_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / sizeof (struct ext3_group_desc))
142# define EXT3_INODES_PER_GROUP(s) ((s)->s_inodes_per_group)
143#endif
144 121
145/* 122/*
146 * Constants relative to the data blocks 123 * Constants relative to the data blocks
@@ -336,7 +313,6 @@ struct ext3_inode {
336 313
337#define i_size_high i_dir_acl 314#define i_size_high i_dir_acl
338 315
339#if defined(__KERNEL__) || defined(__linux__)
340#define i_reserved1 osd1.linux1.l_i_reserved1 316#define i_reserved1 osd1.linux1.l_i_reserved1
341#define i_frag osd2.linux2.l_i_frag 317#define i_frag osd2.linux2.l_i_frag
342#define i_fsize osd2.linux2.l_i_fsize 318#define i_fsize osd2.linux2.l_i_fsize
@@ -346,24 +322,6 @@ struct ext3_inode {
346#define i_gid_high osd2.linux2.l_i_gid_high 322#define i_gid_high osd2.linux2.l_i_gid_high
347#define i_reserved2 osd2.linux2.l_i_reserved2 323#define i_reserved2 osd2.linux2.l_i_reserved2
348 324
349#elif defined(__GNU__)
350
351#define i_translator osd1.hurd1.h_i_translator
352#define i_frag osd2.hurd2.h_i_frag;
353#define i_fsize osd2.hurd2.h_i_fsize;
354#define i_uid_high osd2.hurd2.h_i_uid_high
355#define i_gid_high osd2.hurd2.h_i_gid_high
356#define i_author osd2.hurd2.h_i_author
357
358#elif defined(__masix__)
359
360#define i_reserved1 osd1.masix1.m_i_reserved1
361#define i_frag osd2.masix2.m_i_frag
362#define i_fsize osd2.masix2.m_i_fsize
363#define i_reserved2 osd2.masix2.m_i_reserved2
364
365#endif /* defined(__KERNEL__) || defined(__linux__) */
366
367/* 325/*
368 * File system states 326 * File system states
369 */ 327 */
@@ -531,9 +489,197 @@ struct ext3_super_block {
531 __u32 s_reserved[162]; /* Padding to the end of the block */ 489 __u32 s_reserved[162]; /* Padding to the end of the block */
532}; 490};
533 491
534#ifdef __KERNEL__ 492/* data type for block offset of block group */
535#include <linux/ext3_fs_i.h> 493typedef int ext3_grpblk_t;
536#include <linux/ext3_fs_sb.h> 494
495/* data type for filesystem-wide blocks number */
496typedef unsigned long ext3_fsblk_t;
497
498#define E3FSBLK "%lu"
499
500struct ext3_reserve_window {
501 ext3_fsblk_t _rsv_start; /* First byte reserved */
502 ext3_fsblk_t _rsv_end; /* Last byte reserved or 0 */
503};
504
505struct ext3_reserve_window_node {
506 struct rb_node rsv_node;
507 __u32 rsv_goal_size;
508 __u32 rsv_alloc_hit;
509 struct ext3_reserve_window rsv_window;
510};
511
512struct ext3_block_alloc_info {
513 /* information about reservation window */
514 struct ext3_reserve_window_node rsv_window_node;
515 /*
516 * was i_next_alloc_block in ext3_inode_info
517 * is the logical (file-relative) number of the
518 * most-recently-allocated block in this file.
519 * We use this for detecting linearly ascending allocation requests.
520 */
521 __u32 last_alloc_logical_block;
522 /*
523 * Was i_next_alloc_goal in ext3_inode_info
524 * is the *physical* companion to i_next_alloc_block.
525 * it the physical block number of the block which was most-recentl
526 * allocated to this file. This give us the goal (target) for the next
527 * allocation when we detect linearly ascending requests.
528 */
529 ext3_fsblk_t last_alloc_physical_block;
530};
531
532#define rsv_start rsv_window._rsv_start
533#define rsv_end rsv_window._rsv_end
534
535/*
536 * third extended file system inode data in memory
537 */
538struct ext3_inode_info {
539 __le32 i_data[15]; /* unconverted */
540 __u32 i_flags;
541#ifdef EXT3_FRAGMENTS
542 __u32 i_faddr;
543 __u8 i_frag_no;
544 __u8 i_frag_size;
545#endif
546 ext3_fsblk_t i_file_acl;
547 __u32 i_dir_acl;
548 __u32 i_dtime;
549
550 /*
551 * i_block_group is the number of the block group which contains
552 * this file's inode. Constant across the lifetime of the inode,
553 * it is ued for making block allocation decisions - we try to
554 * place a file's data blocks near its inode block, and new inodes
555 * near to their parent directory's inode.
556 */
557 __u32 i_block_group;
558 unsigned long i_state_flags; /* Dynamic state flags for ext3 */
559
560 /* block reservation info */
561 struct ext3_block_alloc_info *i_block_alloc_info;
562
563 __u32 i_dir_start_lookup;
564#ifdef CONFIG_EXT3_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
575 struct list_head i_orphan; /* unlinked but open inodes */
576
577 /*
578 * i_disksize keeps track of what the inode size is ON DISK, not
579 * in memory. During truncate, i_size is set to the new size by
580 * the VFS prior to calling ext3_truncate(), but the filesystem won't
581 * set i_disksize to 0 until the truncate is actually under way.
582 *
583 * The intent is that i_disksize always represents the blocks which
584 * are used by this file. This allows recovery to restart truncate
585 * on orphans if we crash during truncate. We actually write i_disksize
586 * into the on-disk inode when writing inodes out, instead of i_size.
587 *
588 * The only time when i_disksize and i_size may be different is when
589 * a truncate is in progress. The only things which change i_disksize
590 * are ext3_get_block (growth) and ext3_truncate (shrinkth).
591 */
592 loff_t i_disksize;
593
594 /* on-disk additional length */
595 __u16 i_extra_isize;
596
597 /*
598 * truncate_mutex is for serialising ext3_truncate() against
599 * ext3_getblock(). In the 2.4 ext2 design, great chunks of inode's
600 * data tree are chopped off during truncate. We can't do that in
601 * ext3 because whenever we perform intermediate commits during
602 * truncate, the inode and all the metadata blocks *must* be in a
603 * consistent state which allows truncation of the orphans to restart
604 * during recovery. Hence we must fix the get_block-vs-truncate race
605 * by other means, so we have truncate_mutex.
606 */
607 struct mutex truncate_mutex;
608
609 /*
610 * Transactions that contain inode's metadata needed to complete
611 * fsync and fdatasync, respectively.
612 */
613 atomic_t i_sync_tid;
614 atomic_t i_datasync_tid;
615
616 struct inode vfs_inode;
617};
618
619/*
620 * third extended-fs super-block data in memory
621 */
622struct ext3_sb_info {
623 unsigned long s_frag_size; /* Size of a fragment in bytes */
624 unsigned long s_frags_per_block;/* Number of fragments per block */
625 unsigned long s_inodes_per_block;/* Number of inodes per block */
626 unsigned long s_frags_per_group;/* Number of fragments in a group */
627 unsigned long s_blocks_per_group;/* Number of blocks in a group */
628 unsigned long s_inodes_per_group;/* Number of inodes in a group */
629 unsigned long s_itb_per_group; /* Number of inode table blocks per group */
630 unsigned long s_gdb_count; /* Number of group descriptor blocks */
631 unsigned long s_desc_per_block; /* Number of group descriptors per block */
632 unsigned long s_groups_count; /* Number of groups in the fs */
633 unsigned long s_overhead_last; /* Last calculated overhead */
634 unsigned long s_blocks_last; /* Last seen block count */
635 struct buffer_head * s_sbh; /* Buffer containing the super block */
636 struct ext3_super_block * s_es; /* Pointer to the super block in the buffer */
637 struct buffer_head ** s_group_desc;
638 unsigned long s_mount_opt;
639 ext3_fsblk_t s_sb_block;
640 uid_t s_resuid;
641 gid_t s_resgid;
642 unsigned short s_mount_state;
643 unsigned short s_pad;
644 int s_addr_per_block_bits;
645 int s_desc_per_block_bits;
646 int s_inode_size;
647 int s_first_ino;
648 spinlock_t s_next_gen_lock;
649 u32 s_next_generation;
650 u32 s_hash_seed[4];
651 int s_def_hash_version;
652 int s_hash_unsigned; /* 3 if hash should be signed, 0 if not */
653 struct percpu_counter s_freeblocks_counter;
654 struct percpu_counter s_freeinodes_counter;
655 struct percpu_counter s_dirs_counter;
656 struct blockgroup_lock *s_blockgroup_lock;
657
658 /* root of the per fs reservation window tree */
659 spinlock_t s_rsv_window_lock;
660 struct rb_root s_rsv_window_root;
661 struct ext3_reserve_window_node s_rsv_window_head;
662
663 /* Journaling */
664 struct inode * s_journal_inode;
665 struct journal_s * s_journal;
666 struct list_head s_orphan;
667 struct mutex s_orphan_lock;
668 struct mutex s_resize_lock;
669 unsigned long s_commit_interval;
670 struct block_device *journal_bdev;
671#ifdef CONFIG_QUOTA
672 char *s_qf_names[MAXQUOTAS]; /* Names of quota files with journalled quota */
673 int s_jquota_fmt; /* Format of quota to use */
674#endif
675};
676
677static inline spinlock_t *
678sb_bgl_lock(struct ext3_sb_info *sbi, unsigned int block_group)
679{
680 return bgl_lock_ptr(sbi->s_blockgroup_lock, block_group);
681}
682
537static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb) 683static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb)
538{ 684{
539 return sb->s_fs_info; 685 return sb->s_fs_info;
@@ -576,12 +722,6 @@ static inline void ext3_clear_inode_state(struct inode *inode, int bit)
576{ 722{
577 clear_bit(bit, &EXT3_I(inode)->i_state_flags); 723 clear_bit(bit, &EXT3_I(inode)->i_state_flags);
578} 724}
579#else
580/* Assume that user mode programs are passing in an ext3fs superblock, not
581 * a kernel struct super_block. This will allow us to call the feature-test
582 * macros from user land. */
583#define EXT3_SB(sb) (sb)
584#endif
585 725
586#define NEXT_ORPHAN(inode) EXT3_I(inode)->i_dtime 726#define NEXT_ORPHAN(inode) EXT3_I(inode)->i_dtime
587 727
@@ -771,8 +911,6 @@ static inline __le16 ext3_rec_len_to_disk(unsigned len)
771#define DX_HASH_HALF_MD4_UNSIGNED 4 911#define DX_HASH_HALF_MD4_UNSIGNED 4
772#define DX_HASH_TEA_UNSIGNED 5 912#define DX_HASH_TEA_UNSIGNED 5
773 913
774#ifdef __KERNEL__
775
776/* hash info structure used by the directory hash */ 914/* hash info structure used by the directory hash */
777struct dx_hash_info 915struct dx_hash_info
778{ 916{
@@ -974,7 +1112,211 @@ extern const struct inode_operations ext3_special_inode_operations;
974extern const struct inode_operations ext3_symlink_inode_operations; 1112extern const struct inode_operations ext3_symlink_inode_operations;
975extern const struct inode_operations ext3_fast_symlink_inode_operations; 1113extern const struct inode_operations ext3_fast_symlink_inode_operations;
976 1114
1115#define EXT3_JOURNAL(inode) (EXT3_SB((inode)->i_sb)->s_journal)
1116
1117/* Define the number of blocks we need to account to a transaction to
1118 * modify one block of data.
1119 *
1120 * We may have to touch one inode, one bitmap buffer, up to three
1121 * indirection blocks, the group and superblock summaries, and the data
1122 * block to complete the transaction. */
1123
1124#define EXT3_SINGLEDATA_TRANS_BLOCKS 8U
1125
1126/* Extended attribute operations touch at most two data buffers,
1127 * two bitmap buffers, and two group summaries, in addition to the inode
1128 * and the superblock, which are already accounted for. */
1129
1130#define EXT3_XATTR_TRANS_BLOCKS 6U
1131
1132/* Define the minimum size for a transaction which modifies data. This
1133 * needs to take into account the fact that we may end up modifying two
1134 * quota files too (one for the group, one for the user quota). The
1135 * superblock only gets updated once, of course, so don't bother
1136 * counting that again for the quota updates. */
1137
1138#define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \
1139 EXT3_XATTR_TRANS_BLOCKS - 2 + \
1140 EXT3_MAXQUOTAS_TRANS_BLOCKS(sb))
1141
1142/* Delete operations potentially hit one directory's namespace plus an
1143 * entire inode, plus arbitrary amounts of bitmap/indirection data. Be
1144 * generous. We can grow the delete transaction later if necessary. */
1145
1146#define EXT3_DELETE_TRANS_BLOCKS(sb) (EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) + 64)
1147
1148/* Define an arbitrary limit for the amount of data we will anticipate
1149 * writing to any given transaction. For unbounded transactions such as
1150 * write(2) and truncate(2) we can write more than this, but we always
1151 * start off at the maximum transaction size and grow the transaction
1152 * optimistically as we go. */
1153
1154#define EXT3_MAX_TRANS_DATA 64U
1155
1156/* We break up a large truncate or write transaction once the handle's
1157 * buffer credits gets this low, we need either to extend the
1158 * transaction or to start a new one. Reserve enough space here for
1159 * inode, bitmap, superblock, group and indirection updates for at least
1160 * one block, plus two quota updates. Quota allocations are not
1161 * needed. */
1162
1163#define EXT3_RESERVE_TRANS_BLOCKS 12U
1164
1165#define EXT3_INDEX_EXTRA_TRANS_BLOCKS 8
1166
1167#ifdef CONFIG_QUOTA
1168/* Amount of blocks needed for quota update - we know that the structure was
1169 * allocated so we need to update only inode+data */
1170#define EXT3_QUOTA_TRANS_BLOCKS(sb) (test_opt(sb, QUOTA) ? 2 : 0)
1171/* Amount of blocks needed for quota insert/delete - we do some block writes
1172 * but inode, sb and group updates are done only once */
1173#define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_INIT_ALLOC*\
1174 (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
1175#define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_DEL_ALLOC*\
1176 (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
1177#else
1178#define EXT3_QUOTA_TRANS_BLOCKS(sb) 0
1179#define EXT3_QUOTA_INIT_BLOCKS(sb) 0
1180#define EXT3_QUOTA_DEL_BLOCKS(sb) 0
1181#endif
1182#define EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb))
1183#define EXT3_MAXQUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb))
1184#define EXT3_MAXQUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb))
1185
1186int
1187ext3_mark_iloc_dirty(handle_t *handle,
1188 struct inode *inode,
1189 struct ext3_iloc *iloc);
1190
1191/*
1192 * On success, We end up with an outstanding reference count against
1193 * iloc->bh. This _must_ be cleaned up later.
1194 */
1195
1196int ext3_reserve_inode_write(handle_t *handle, struct inode *inode,
1197 struct ext3_iloc *iloc);
1198
1199int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode);
1200
1201/*
1202 * Wrapper functions with which ext3 calls into JBD. The intent here is
1203 * to allow these to be turned into appropriate stubs so ext3 can control
1204 * ext2 filesystems, so ext2+ext3 systems only nee one fs. This work hasn't
1205 * been done yet.
1206 */
1207
1208static inline void ext3_journal_release_buffer(handle_t *handle,
1209 struct buffer_head *bh)
1210{
1211 journal_release_buffer(handle, bh);
1212}
1213
1214void ext3_journal_abort_handle(const char *caller, const char *err_fn,
1215 struct buffer_head *bh, handle_t *handle, int err);
1216
1217int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
1218 struct buffer_head *bh);
1219
1220int __ext3_journal_get_write_access(const char *where, handle_t *handle,
1221 struct buffer_head *bh);
1222
1223int __ext3_journal_forget(const char *where, handle_t *handle,
1224 struct buffer_head *bh);
977 1225
978#endif /* __KERNEL__ */ 1226int __ext3_journal_revoke(const char *where, handle_t *handle,
1227 unsigned long blocknr, struct buffer_head *bh);
1228
1229int __ext3_journal_get_create_access(const char *where,
1230 handle_t *handle, struct buffer_head *bh);
1231
1232int __ext3_journal_dirty_metadata(const char *where,
1233 handle_t *handle, struct buffer_head *bh);
1234
1235#define ext3_journal_get_undo_access(handle, bh) \
1236 __ext3_journal_get_undo_access(__func__, (handle), (bh))
1237#define ext3_journal_get_write_access(handle, bh) \
1238 __ext3_journal_get_write_access(__func__, (handle), (bh))
1239#define ext3_journal_revoke(handle, blocknr, bh) \
1240 __ext3_journal_revoke(__func__, (handle), (blocknr), (bh))
1241#define ext3_journal_get_create_access(handle, bh) \
1242 __ext3_journal_get_create_access(__func__, (handle), (bh))
1243#define ext3_journal_dirty_metadata(handle, bh) \
1244 __ext3_journal_dirty_metadata(__func__, (handle), (bh))
1245#define ext3_journal_forget(handle, bh) \
1246 __ext3_journal_forget(__func__, (handle), (bh))
1247
1248int ext3_journal_dirty_data(handle_t *handle, struct buffer_head *bh);
1249
1250handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks);
1251int __ext3_journal_stop(const char *where, handle_t *handle);
1252
1253static inline handle_t *ext3_journal_start(struct inode *inode, int nblocks)
1254{
1255 return ext3_journal_start_sb(inode->i_sb, nblocks);
1256}
1257
1258#define ext3_journal_stop(handle) \
1259 __ext3_journal_stop(__func__, (handle))
1260
1261static inline handle_t *ext3_journal_current_handle(void)
1262{
1263 return journal_current_handle();
1264}
1265
1266static inline int ext3_journal_extend(handle_t *handle, int nblocks)
1267{
1268 return journal_extend(handle, nblocks);
1269}
1270
1271static inline int ext3_journal_restart(handle_t *handle, int nblocks)
1272{
1273 return journal_restart(handle, nblocks);
1274}
1275
1276static inline int ext3_journal_blocks_per_page(struct inode *inode)
1277{
1278 return journal_blocks_per_page(inode);
1279}
1280
1281static inline int ext3_journal_force_commit(journal_t *journal)
1282{
1283 return journal_force_commit(journal);
1284}
1285
1286/* super.c */
1287int ext3_force_commit(struct super_block *sb);
1288
1289static inline int ext3_should_journal_data(struct inode *inode)
1290{
1291 if (!S_ISREG(inode->i_mode))
1292 return 1;
1293 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA)
1294 return 1;
1295 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL)
1296 return 1;
1297 return 0;
1298}
1299
1300static inline int ext3_should_order_data(struct inode *inode)
1301{
1302 if (!S_ISREG(inode->i_mode))
1303 return 0;
1304 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL)
1305 return 0;
1306 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA)
1307 return 1;
1308 return 0;
1309}
1310
1311static inline int ext3_should_writeback_data(struct inode *inode)
1312{
1313 if (!S_ISREG(inode->i_mode))
1314 return 0;
1315 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL)
1316 return 0;
1317 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_WRITEBACK_DATA)
1318 return 1;
1319 return 0;
1320}
979 1321
980#endif /* _LINUX_EXT3_FS_H */ 1322#include <trace/events/ext3.h>
diff --git a/fs/ext3/ext3_jbd.c b/fs/ext3/ext3_jbd.c
index d401f148d74d..785a3261a26c 100644
--- a/fs/ext3/ext3_jbd.c
+++ b/fs/ext3/ext3_jbd.c
@@ -2,7 +2,7 @@
2 * Interface between ext3 and JBD 2 * Interface between ext3 and JBD
3 */ 3 */
4 4
5#include <linux/ext3_jbd.h> 5#include "ext3.h"
6 6
7int __ext3_journal_get_undo_access(const char *where, handle_t *handle, 7int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
8 struct buffer_head *bh) 8 struct buffer_head *bh)
diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index 724df69847dc..25cb413277e9 100644
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -18,12 +18,8 @@
18 * (jj@sunsite.ms.mff.cuni.cz) 18 * (jj@sunsite.ms.mff.cuni.cz)
19 */ 19 */
20 20
21#include <linux/time.h>
22#include <linux/fs.h>
23#include <linux/jbd.h>
24#include <linux/quotaops.h> 21#include <linux/quotaops.h>
25#include <linux/ext3_fs.h> 22#include "ext3.h"
26#include <linux/ext3_jbd.h>
27#include "xattr.h" 23#include "xattr.h"
28#include "acl.h" 24#include "acl.h"
29 25
diff --git a/fs/ext3/fsync.c b/fs/ext3/fsync.c
index 1860ed356323..d4dff278cbd8 100644
--- a/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@ -22,15 +22,9 @@
22 * we can depend on generic_block_fdatasync() to sync the data blocks. 22 * we can depend on generic_block_fdatasync() to sync the data blocks.
23 */ 23 */
24 24
25#include <linux/time.h>
26#include <linux/blkdev.h> 25#include <linux/blkdev.h>
27#include <linux/fs.h>
28#include <linux/sched.h>
29#include <linux/writeback.h> 26#include <linux/writeback.h>
30#include <linux/jbd.h> 27#include "ext3.h"
31#include <linux/ext3_fs.h>
32#include <linux/ext3_jbd.h>
33#include <trace/events/ext3.h>
34 28
35/* 29/*
36 * akpm: A new design for ext3_sync_file(). 30 * akpm: A new design for ext3_sync_file().
diff --git a/fs/ext3/hash.c b/fs/ext3/hash.c
index 7d215b4d4f2e..d10231ddcf8a 100644
--- a/fs/ext3/hash.c
+++ b/fs/ext3/hash.c
@@ -9,9 +9,7 @@
9 * License. 9 * License.
10 */ 10 */
11 11
12#include <linux/fs.h> 12#include "ext3.h"
13#include <linux/jbd.h>
14#include <linux/ext3_fs.h>
15#include <linux/cryptohash.h> 13#include <linux/cryptohash.h>
16 14
17#define DELTA 0x9E3779B9 15#define DELTA 0x9E3779B9
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index 1cde28438014..e3c39e4cec19 100644
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -12,21 +12,10 @@
12 * David S. Miller (davem@caip.rutgers.edu), 1995 12 * David S. Miller (davem@caip.rutgers.edu), 1995
13 */ 13 */
14 14
15#include <linux/time.h>
16#include <linux/fs.h>
17#include <linux/jbd.h>
18#include <linux/ext3_fs.h>
19#include <linux/ext3_jbd.h>
20#include <linux/stat.h>
21#include <linux/string.h>
22#include <linux/quotaops.h> 15#include <linux/quotaops.h>
23#include <linux/buffer_head.h>
24#include <linux/random.h> 16#include <linux/random.h>
25#include <linux/bitops.h>
26#include <trace/events/ext3.h>
27
28#include <asm/byteorder.h>
29 17
18#include "ext3.h"
30#include "xattr.h" 19#include "xattr.h"
31#include "acl.h" 20#include "acl.h"
32 21
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 6d3418662b54..10d7812f6021 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -22,22 +22,12 @@
22 * Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000 22 * Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000
23 */ 23 */
24 24
25#include <linux/fs.h>
26#include <linux/time.h>
27#include <linux/ext3_jbd.h>
28#include <linux/jbd.h>
29#include <linux/highuid.h> 25#include <linux/highuid.h>
30#include <linux/pagemap.h>
31#include <linux/quotaops.h> 26#include <linux/quotaops.h>
32#include <linux/string.h>
33#include <linux/buffer_head.h>
34#include <linux/writeback.h> 27#include <linux/writeback.h>
35#include <linux/mpage.h> 28#include <linux/mpage.h>
36#include <linux/uio.h>
37#include <linux/bio.h>
38#include <linux/fiemap.h>
39#include <linux/namei.h> 29#include <linux/namei.h>
40#include <trace/events/ext3.h> 30#include "ext3.h"
41#include "xattr.h" 31#include "xattr.h"
42#include "acl.h" 32#include "acl.h"
43 33
diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index 4af574ce4a46..677a5c27dc69 100644
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -7,15 +7,10 @@
7 * Universite Pierre et Marie Curie (Paris VI) 7 * Universite Pierre et Marie Curie (Paris VI)
8 */ 8 */
9 9
10#include <linux/fs.h>
11#include <linux/jbd.h>
12#include <linux/capability.h>
13#include <linux/ext3_fs.h>
14#include <linux/ext3_jbd.h>
15#include <linux/mount.h> 10#include <linux/mount.h>
16#include <linux/time.h>
17#include <linux/compat.h> 11#include <linux/compat.h>
18#include <asm/uaccess.h> 12#include <asm/uaccess.h>
13#include "ext3.h"
19 14
20long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 15long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
21{ 16{
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index e8e211795e9f..d7940b24cf68 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -24,20 +24,8 @@
24 * Theodore Ts'o, 2002 24 * Theodore Ts'o, 2002
25 */ 25 */
26 26
27#include <linux/fs.h>
28#include <linux/pagemap.h>
29#include <linux/jbd.h>
30#include <linux/time.h>
31#include <linux/ext3_fs.h>
32#include <linux/ext3_jbd.h>
33#include <linux/fcntl.h>
34#include <linux/stat.h>
35#include <linux/string.h>
36#include <linux/quotaops.h> 27#include <linux/quotaops.h>
37#include <linux/buffer_head.h> 28#include "ext3.h"
38#include <linux/bio.h>
39#include <trace/events/ext3.h>
40
41#include "namei.h" 29#include "namei.h"
42#include "xattr.h" 30#include "xattr.h"
43#include "acl.h" 31#include "acl.h"
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 7916e4ce166a..0f814f3450de 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -11,10 +11,7 @@
11 11
12#define EXT3FS_DEBUG 12#define EXT3FS_DEBUG
13 13
14#include <linux/ext3_jbd.h> 14#include "ext3.h"
15
16#include <linux/errno.h>
17#include <linux/slab.h>
18 15
19 16
20#define outside(b, first, last) ((b) < (first) || (b) >= (last)) 17#define outside(b, first, last) ((b) < (first) || (b) >= (last))
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index e0b45b93327b..cf0b5921cf0f 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -17,22 +17,12 @@
17 */ 17 */
18 18
19#include <linux/module.h> 19#include <linux/module.h>
20#include <linux/string.h>
21#include <linux/fs.h>
22#include <linux/time.h>
23#include <linux/jbd.h>
24#include <linux/ext3_fs.h>
25#include <linux/ext3_jbd.h>
26#include <linux/slab.h>
27#include <linux/init.h>
28#include <linux/blkdev.h> 20#include <linux/blkdev.h>
29#include <linux/parser.h> 21#include <linux/parser.h>
30#include <linux/buffer_head.h>
31#include <linux/exportfs.h> 22#include <linux/exportfs.h>
32#include <linux/vfs.h> 23#include <linux/statfs.h>
33#include <linux/random.h> 24#include <linux/random.h>
34#include <linux/mount.h> 25#include <linux/mount.h>
35#include <linux/namei.h>
36#include <linux/quotaops.h> 26#include <linux/quotaops.h>
37#include <linux/seq_file.h> 27#include <linux/seq_file.h>
38#include <linux/log2.h> 28#include <linux/log2.h>
@@ -40,13 +30,13 @@
40 30
41#include <asm/uaccess.h> 31#include <asm/uaccess.h>
42 32
33#define CREATE_TRACE_POINTS
34
35#include "ext3.h"
43#include "xattr.h" 36#include "xattr.h"
44#include "acl.h" 37#include "acl.h"
45#include "namei.h" 38#include "namei.h"
46 39
47#define CREATE_TRACE_POINTS
48#include <trace/events/ext3.h>
49
50#ifdef CONFIG_EXT3_DEFAULTS_TO_ORDERED 40#ifdef CONFIG_EXT3_DEFAULTS_TO_ORDERED
51 #define EXT3_MOUNT_DEFAULT_DATA_MODE EXT3_MOUNT_ORDERED_DATA 41 #define EXT3_MOUNT_DEFAULT_DATA_MODE EXT3_MOUNT_ORDERED_DATA
52#else 42#else
diff --git a/fs/ext3/symlink.c b/fs/ext3/symlink.c
index 7c4898207776..6b01c3eab1f3 100644
--- a/fs/ext3/symlink.c
+++ b/fs/ext3/symlink.c
@@ -17,10 +17,8 @@
17 * ext3 symlink handling code 17 * ext3 symlink handling code
18 */ 18 */
19 19
20#include <linux/fs.h>
21#include <linux/jbd.h>
22#include <linux/ext3_fs.h>
23#include <linux/namei.h> 20#include <linux/namei.h>
21#include "ext3.h"
24#include "xattr.h" 22#include "xattr.h"
25 23
26static void * ext3_follow_link(struct dentry *dentry, struct nameidata *nd) 24static void * ext3_follow_link(struct dentry *dentry, struct nameidata *nd)
diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index d565759d82ee..d22ebb7a4f55 100644
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -50,14 +50,9 @@
50 * by the buffer lock. 50 * by the buffer lock.
51 */ 51 */
52 52
53#include <linux/init.h> 53#include "ext3.h"
54#include <linux/fs.h>
55#include <linux/slab.h>
56#include <linux/ext3_jbd.h>
57#include <linux/ext3_fs.h>
58#include <linux/mbcache.h> 54#include <linux/mbcache.h>
59#include <linux/quotaops.h> 55#include <linux/quotaops.h>
60#include <linux/rwsem.h>
61#include "xattr.h" 56#include "xattr.h"
62#include "acl.h" 57#include "acl.h"
63 58
diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index ea26f2acab94..3387664ad70e 100644
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -3,12 +3,8 @@
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>
7#include <linux/string.h>
8#include <linux/fs.h>
9#include <linux/ext3_jbd.h>
10#include <linux/ext3_fs.h>
11#include <linux/security.h> 6#include <linux/security.h>
7#include "ext3.h"
12#include "xattr.h" 8#include "xattr.h"
13 9
14static size_t 10static size_t
diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c
index 2526a8829de8..d75727cc67fa 100644
--- a/fs/ext3/xattr_trusted.c
+++ b/fs/ext3/xattr_trusted.c
@@ -5,11 +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 "ext3.h"
9#include <linux/capability.h>
10#include <linux/fs.h>
11#include <linux/ext3_jbd.h>
12#include <linux/ext3_fs.h>
13#include "xattr.h" 9#include "xattr.h"
14 10
15static size_t 11static size_t
diff --git a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c
index b32e473a1e33..5612af3567e0 100644
--- a/fs/ext3/xattr_user.c
+++ b/fs/ext3/xattr_user.c
@@ -5,10 +5,7 @@
5 * Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org> 5 * Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
6 */ 6 */
7 7
8#include <linux/string.h> 8#include "ext3.h"
9#include <linux/fs.h>
10#include <linux/ext3_jbd.h>
11#include <linux/ext3_fs.h>
12#include "xattr.h" 9#include "xattr.h"
13 10
14static size_t 11static size_t
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 76834587a8a4..a3d2c9ee8d66 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -18,7 +18,6 @@
18#include <linux/mount.h> 18#include <linux/mount.h>
19#include <linux/fs.h> 19#include <linux/fs.h>
20#include <linux/gfs2_ondisk.h> 20#include <linux/gfs2_ondisk.h>
21#include <linux/ext2_fs.h>
22#include <linux/falloc.h> 21#include <linux/falloc.h>
23#include <linux/swap.h> 22#include <linux/swap.h>
24#include <linux/crc32.h> 23#include <linux/crc32.h>
diff --git a/fs/namei.c b/fs/namei.c
index e615ff37e27d..1898198abc3d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1054,53 +1054,65 @@ static void follow_dotdot(struct nameidata *nd)
1054} 1054}
1055 1055
1056/* 1056/*
1057 * Allocate a dentry with name and parent, and perform a parent 1057 * This looks up the name in dcache, possibly revalidates the old dentry and
1058 * directory ->lookup on it. Returns the new dentry, or ERR_PTR 1058 * allocates a new one if not found or not valid. In the need_lookup argument
1059 * on error. parent->d_inode->i_mutex must be held. d_lookup must 1059 * returns whether i_op->lookup is necessary.
1060 * have verified that no child exists while under i_mutex. 1060 *
1061 * dir->d_inode->i_mutex must be held
1061 */ 1062 */
1062static struct dentry *d_alloc_and_lookup(struct dentry *parent, 1063static struct dentry *lookup_dcache(struct qstr *name, struct dentry *dir,
1063 struct qstr *name, struct nameidata *nd) 1064 struct nameidata *nd, bool *need_lookup)
1064{ 1065{
1065 struct inode *inode = parent->d_inode;
1066 struct dentry *dentry; 1066 struct dentry *dentry;
1067 struct dentry *old; 1067 int error;
1068 1068
1069 /* Don't create child dentry for a dead directory. */ 1069 *need_lookup = false;
1070 if (unlikely(IS_DEADDIR(inode))) 1070 dentry = d_lookup(dir, name);
1071 return ERR_PTR(-ENOENT); 1071 if (dentry) {
1072 if (d_need_lookup(dentry)) {
1073 *need_lookup = true;
1074 } else if (dentry->d_flags & DCACHE_OP_REVALIDATE) {
1075 error = d_revalidate(dentry, nd);
1076 if (unlikely(error <= 0)) {
1077 if (error < 0) {
1078 dput(dentry);
1079 return ERR_PTR(error);
1080 } else if (!d_invalidate(dentry)) {
1081 dput(dentry);
1082 dentry = NULL;
1083 }
1084 }
1085 }
1086 }
1072 1087
1073 dentry = d_alloc(parent, name); 1088 if (!dentry) {
1074 if (unlikely(!dentry)) 1089 dentry = d_alloc(dir, name);
1075 return ERR_PTR(-ENOMEM); 1090 if (unlikely(!dentry))
1091 return ERR_PTR(-ENOMEM);
1076 1092
1077 old = inode->i_op->lookup(inode, dentry, nd); 1093 *need_lookup = true;
1078 if (unlikely(old)) {
1079 dput(dentry);
1080 dentry = old;
1081 } 1094 }
1082 return dentry; 1095 return dentry;
1083} 1096}
1084 1097
1085/* 1098/*
1086 * We already have a dentry, but require a lookup to be performed on the parent 1099 * Call i_op->lookup on the dentry. The dentry must be negative but may be
1087 * directory to fill in d_inode. Returns the new dentry, or ERR_PTR on error. 1100 * hashed if it was pouplated with DCACHE_NEED_LOOKUP.
1088 * parent->d_inode->i_mutex must be held. d_lookup must have verified that no 1101 *
1089 * child exists while under i_mutex. 1102 * dir->d_inode->i_mutex must be held
1090 */ 1103 */
1091static struct dentry *d_inode_lookup(struct dentry *parent, struct dentry *dentry, 1104static struct dentry *lookup_real(struct inode *dir, struct dentry *dentry,
1092 struct nameidata *nd) 1105 struct nameidata *nd)
1093{ 1106{
1094 struct inode *inode = parent->d_inode;
1095 struct dentry *old; 1107 struct dentry *old;
1096 1108
1097 /* Don't create child dentry for a dead directory. */ 1109 /* Don't create child dentry for a dead directory. */
1098 if (unlikely(IS_DEADDIR(inode))) { 1110 if (unlikely(IS_DEADDIR(dir))) {
1099 dput(dentry); 1111 dput(dentry);
1100 return ERR_PTR(-ENOENT); 1112 return ERR_PTR(-ENOENT);
1101 } 1113 }
1102 1114
1103 old = inode->i_op->lookup(inode, dentry, nd); 1115 old = dir->i_op->lookup(dir, dentry, nd);
1104 if (unlikely(old)) { 1116 if (unlikely(old)) {
1105 dput(dentry); 1117 dput(dentry);
1106 dentry = old; 1118 dentry = old;
@@ -1108,6 +1120,19 @@ static struct dentry *d_inode_lookup(struct dentry *parent, struct dentry *dentr
1108 return dentry; 1120 return dentry;
1109} 1121}
1110 1122
1123static struct dentry *__lookup_hash(struct qstr *name,
1124 struct dentry *base, struct nameidata *nd)
1125{
1126 bool need_lookup;
1127 struct dentry *dentry;
1128
1129 dentry = lookup_dcache(name, base, nd, &need_lookup);
1130 if (!need_lookup)
1131 return dentry;
1132
1133 return lookup_real(base->d_inode, dentry, nd);
1134}
1135
1111/* 1136/*
1112 * It's more convoluted than I'd like it to be, but... it's still fairly 1137 * It's more convoluted than I'd like it to be, but... it's still fairly
1113 * small and for now I'd prefer to have fast path as straight as possible. 1138 * small and for now I'd prefer to have fast path as straight as possible.
@@ -1139,6 +1164,8 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
1139 return -ECHILD; 1164 return -ECHILD;
1140 nd->seq = seq; 1165 nd->seq = seq;
1141 1166
1167 if (unlikely(d_need_lookup(dentry)))
1168 goto unlazy;
1142 if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) { 1169 if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) {
1143 status = d_revalidate(dentry, nd); 1170 status = d_revalidate(dentry, nd);
1144 if (unlikely(status <= 0)) { 1171 if (unlikely(status <= 0)) {
@@ -1147,8 +1174,6 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
1147 goto unlazy; 1174 goto unlazy;
1148 } 1175 }
1149 } 1176 }
1150 if (unlikely(d_need_lookup(dentry)))
1151 goto unlazy;
1152 path->mnt = mnt; 1177 path->mnt = mnt;
1153 path->dentry = dentry; 1178 path->dentry = dentry;
1154 if (unlikely(!__follow_mount_rcu(nd, path, inode))) 1179 if (unlikely(!__follow_mount_rcu(nd, path, inode)))
@@ -1163,38 +1188,14 @@ unlazy:
1163 dentry = __d_lookup(parent, name); 1188 dentry = __d_lookup(parent, name);
1164 } 1189 }
1165 1190
1166 if (dentry && unlikely(d_need_lookup(dentry))) { 1191 if (unlikely(!dentry))
1192 goto need_lookup;
1193
1194 if (unlikely(d_need_lookup(dentry))) {
1167 dput(dentry); 1195 dput(dentry);
1168 dentry = NULL; 1196 goto need_lookup;
1169 }
1170retry:
1171 if (unlikely(!dentry)) {
1172 struct inode *dir = parent->d_inode;
1173 BUG_ON(nd->inode != dir);
1174
1175 mutex_lock(&dir->i_mutex);
1176 dentry = d_lookup(parent, name);
1177 if (likely(!dentry)) {
1178 dentry = d_alloc_and_lookup(parent, name, nd);
1179 if (IS_ERR(dentry)) {
1180 mutex_unlock(&dir->i_mutex);
1181 return PTR_ERR(dentry);
1182 }
1183 /* known good */
1184 need_reval = 0;
1185 status = 1;
1186 } else if (unlikely(d_need_lookup(dentry))) {
1187 dentry = d_inode_lookup(parent, dentry, nd);
1188 if (IS_ERR(dentry)) {
1189 mutex_unlock(&dir->i_mutex);
1190 return PTR_ERR(dentry);
1191 }
1192 /* known good */
1193 need_reval = 0;
1194 status = 1;
1195 }
1196 mutex_unlock(&dir->i_mutex);
1197 } 1197 }
1198
1198 if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) 1199 if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)
1199 status = d_revalidate(dentry, nd); 1200 status = d_revalidate(dentry, nd);
1200 if (unlikely(status <= 0)) { 1201 if (unlikely(status <= 0)) {
@@ -1204,12 +1205,10 @@ retry:
1204 } 1205 }
1205 if (!d_invalidate(dentry)) { 1206 if (!d_invalidate(dentry)) {
1206 dput(dentry); 1207 dput(dentry);
1207 dentry = NULL; 1208 goto need_lookup;
1208 need_reval = 1;
1209 goto retry;
1210 } 1209 }
1211 } 1210 }
1212 1211done:
1213 path->mnt = mnt; 1212 path->mnt = mnt;
1214 path->dentry = dentry; 1213 path->dentry = dentry;
1215 err = follow_managed(path, nd->flags); 1214 err = follow_managed(path, nd->flags);
@@ -1221,6 +1220,16 @@ retry:
1221 nd->flags |= LOOKUP_JUMPED; 1220 nd->flags |= LOOKUP_JUMPED;
1222 *inode = path->dentry->d_inode; 1221 *inode = path->dentry->d_inode;
1223 return 0; 1222 return 0;
1223
1224need_lookup:
1225 BUG_ON(nd->inode != parent->d_inode);
1226
1227 mutex_lock(&parent->d_inode->i_mutex);
1228 dentry = __lookup_hash(name, parent, nd);
1229 mutex_unlock(&parent->d_inode->i_mutex);
1230 if (IS_ERR(dentry))
1231 return PTR_ERR(dentry);
1232 goto done;
1224} 1233}
1225 1234
1226static inline int may_lookup(struct nameidata *nd) 1235static inline int may_lookup(struct nameidata *nd)
@@ -1846,59 +1855,6 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
1846 return err; 1855 return err;
1847} 1856}
1848 1857
1849static struct dentry *__lookup_hash(struct qstr *name,
1850 struct dentry *base, struct nameidata *nd)
1851{
1852 struct inode *inode = base->d_inode;
1853 struct dentry *dentry;
1854 int err;
1855
1856 err = inode_permission(inode, MAY_EXEC);
1857 if (err)
1858 return ERR_PTR(err);
1859
1860 /*
1861 * Don't bother with __d_lookup: callers are for creat as
1862 * well as unlink, so a lot of the time it would cost
1863 * a double lookup.
1864 */
1865 dentry = d_lookup(base, name);
1866
1867 if (dentry && d_need_lookup(dentry)) {
1868 /*
1869 * __lookup_hash is called with the parent dir's i_mutex already
1870 * held, so we are good to go here.
1871 */
1872 dentry = d_inode_lookup(base, dentry, nd);
1873 if (IS_ERR(dentry))
1874 return dentry;
1875 }
1876
1877 if (dentry && (dentry->d_flags & DCACHE_OP_REVALIDATE)) {
1878 int status = d_revalidate(dentry, nd);
1879 if (unlikely(status <= 0)) {
1880 /*
1881 * The dentry failed validation.
1882 * If d_revalidate returned 0 attempt to invalidate
1883 * the dentry otherwise d_revalidate is asking us
1884 * to return a fail status.
1885 */
1886 if (status < 0) {
1887 dput(dentry);
1888 return ERR_PTR(status);
1889 } else if (!d_invalidate(dentry)) {
1890 dput(dentry);
1891 dentry = NULL;
1892 }
1893 }
1894 }
1895
1896 if (!dentry)
1897 dentry = d_alloc_and_lookup(base, name, nd);
1898
1899 return dentry;
1900}
1901
1902/* 1858/*
1903 * Restricted form of lookup. Doesn't follow links, single-component only, 1859 * Restricted form of lookup. Doesn't follow links, single-component only,
1904 * needs parent already locked. Doesn't follow mounts. 1860 * needs parent already locked. Doesn't follow mounts.
@@ -1924,6 +1880,7 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
1924{ 1880{
1925 struct qstr this; 1881 struct qstr this;
1926 unsigned int c; 1882 unsigned int c;
1883 int err;
1927 1884
1928 WARN_ON_ONCE(!mutex_is_locked(&base->d_inode->i_mutex)); 1885 WARN_ON_ONCE(!mutex_is_locked(&base->d_inode->i_mutex));
1929 1886
@@ -1948,6 +1905,10 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
1948 return ERR_PTR(err); 1905 return ERR_PTR(err);
1949 } 1906 }
1950 1907
1908 err = inode_permission(base->d_inode, MAY_EXEC);
1909 if (err)
1910 return ERR_PTR(err);
1911
1951 return __lookup_hash(&this, base, NULL); 1912 return __lookup_hash(&this, base, NULL);
1952} 1913}
1953 1914
@@ -2749,7 +2710,7 @@ SYSCALL_DEFINE2(mkdir, const char __user *, pathname, umode_t, mode)
2749 2710
2750/* 2711/*
2751 * The dentry_unhash() helper will try to drop the dentry early: we 2712 * The dentry_unhash() helper will try to drop the dentry early: we
2752 * should have a usage count of 2 if we're the only user of this 2713 * should have a usage count of 1 if we're the only user of this
2753 * dentry, and if that is true (possibly after pruning the dcache), 2714 * dentry, and if that is true (possibly after pruning the dcache),
2754 * then we drop the dentry now. 2715 * then we drop the dentry now.
2755 * 2716 *
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index a6fda3c188aa..a1a1bfd652c9 100644
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -28,8 +28,6 @@
28#include "suballoc.h" 28#include "suballoc.h"
29#include "move_extents.h" 29#include "move_extents.h"
30 30
31#include <linux/ext2_fs.h>
32
33#define o2info_from_user(a, b) \ 31#define o2info_from_user(a, b) \
34 copy_from_user(&(a), (b), sizeof(a)) 32 copy_from_user(&(a), (b), sizeof(a))
35#define o2info_to_user(a, b) \ 33#define o2info_to_user(a, b) \
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index f37c32b94525..50952c9bd06c 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -105,26 +105,12 @@ static const struct inode_operations pstore_dir_inode_operations = {
105 .unlink = pstore_unlink, 105 .unlink = pstore_unlink,
106}; 106};
107 107
108static struct inode *pstore_get_inode(struct super_block *sb, 108static struct inode *pstore_get_inode(struct super_block *sb)
109 const struct inode *dir, int mode, dev_t dev)
110{ 109{
111 struct inode *inode = new_inode(sb); 110 struct inode *inode = new_inode(sb);
112
113 if (inode) { 111 if (inode) {
114 inode->i_ino = get_next_ino(); 112 inode->i_ino = get_next_ino();
115 inode->i_uid = inode->i_gid = 0;
116 inode->i_mode = mode;
117 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; 113 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
118 switch (mode & S_IFMT) {
119 case S_IFREG:
120 inode->i_fop = &pstore_file_operations;
121 break;
122 case S_IFDIR:
123 inode->i_op = &pstore_dir_inode_operations;
124 inode->i_fop = &simple_dir_operations;
125 inc_nlink(inode);
126 break;
127 }
128 } 114 }
129 return inode; 115 return inode;
130} 116}
@@ -216,9 +202,11 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id,
216 return rc; 202 return rc;
217 203
218 rc = -ENOMEM; 204 rc = -ENOMEM;
219 inode = pstore_get_inode(pstore_sb, root->d_inode, S_IFREG | 0444, 0); 205 inode = pstore_get_inode(pstore_sb);
220 if (!inode) 206 if (!inode)
221 goto fail; 207 goto fail;
208 inode->i_mode = S_IFREG | 0444;
209 inode->i_fop = &pstore_file_operations;
222 private = kmalloc(sizeof *private + size, GFP_KERNEL); 210 private = kmalloc(sizeof *private + size, GFP_KERNEL);
223 if (!private) 211 if (!private)
224 goto fail_alloc; 212 goto fail_alloc;
@@ -293,10 +281,12 @@ int pstore_fill_super(struct super_block *sb, void *data, int silent)
293 281
294 parse_options(data); 282 parse_options(data);
295 283
296 inode = pstore_get_inode(sb, NULL, S_IFDIR | 0755, 0); 284 inode = pstore_get_inode(sb);
297 if (inode) { 285 if (inode) {
298 /* override ramfs "dir" options so we catch unlink(2) */ 286 inode->i_mode = S_IFDIR | 0755;
299 inode->i_op = &pstore_dir_inode_operations; 287 inode->i_op = &pstore_dir_inode_operations;
288 inode->i_fop = &simple_dir_operations;
289 inc_nlink(inode);
300 } 290 }
301 sb->s_root = d_make_root(inode); 291 sb->s_root = d_make_root(inode);
302 if (!sb->s_root) 292 if (!sb->s_root)
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index a4b5da2b83f5..d05df2810354 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -120,7 +120,6 @@ header-y += errno.h
120header-y += errqueue.h 120header-y += errqueue.h
121header-y += ethtool.h 121header-y += ethtool.h
122header-y += eventpoll.h 122header-y += eventpoll.h
123header-y += ext2_fs.h
124header-y += fadvise.h 123header-y += fadvise.h
125header-y += falloc.h 124header-y += falloc.h
126header-y += fanotify.h 125header-y += fanotify.h
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index ce1b719e8bd4..2723e715f67a 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -18,574 +18,25 @@
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/* 22#define EXT2_NAME_LEN 255
24 * The second extended filesystem constants/structures
25 */
26
27/*
28 * Define EXT2FS_DEBUG to produce debug messages
29 */
30#undef EXT2FS_DEBUG
31
32/*
33 * Define EXT2_RESERVATION to reserve data blocks for expanding files
34 */
35#define EXT2_DEFAULT_RESERVE_BLOCKS 8
36/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */
37#define EXT2_MAX_RESERVE_BLOCKS 1027
38#define EXT2_RESERVE_WINDOW_NOT_ALLOCATED 0
39/*
40 * The second extended file system version
41 */
42#define EXT2FS_DATE "95/08/09"
43#define EXT2FS_VERSION "0.5b"
44
45/*
46 * Debug code
47 */
48#ifdef EXT2FS_DEBUG
49# define ext2_debug(f, a...) { \
50 printk ("EXT2-fs DEBUG (%s, %d): %s:", \
51 __FILE__, __LINE__, __func__); \
52 printk (f, ## a); \
53 }
54#else
55# define ext2_debug(f, a...) /**/
56#endif
57
58/*
59 * Special inode numbers
60 */
61#define EXT2_BAD_INO 1 /* Bad blocks inode */
62#define EXT2_ROOT_INO 2 /* Root inode */
63#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */
64#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */
65
66/* First non-reserved inode for old ext2 filesystems */
67#define EXT2_GOOD_OLD_FIRST_INO 11
68
69#ifdef __KERNEL__
70#include <linux/ext2_fs_sb.h>
71static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
72{
73 return sb->s_fs_info;
74}
75#else
76/* Assume that user mode programs are passing in an ext2fs superblock, not
77 * a kernel struct super_block. This will allow us to call the feature-test
78 * macros from user land. */
79#define EXT2_SB(sb) (sb)
80#endif
81 23
82/* 24/*
83 * Maximal count of links to a file 25 * Maximal count of links to a file
84 */ 26 */
85#define EXT2_LINK_MAX 32000 27#define EXT2_LINK_MAX 32000
86 28
87/* 29#define EXT2_SB_MAGIC_OFFSET 0x38
88 * Macro-instructions used to manage several block sizes 30#define EXT2_SB_BLOCKS_OFFSET 0x04
89 */ 31#define EXT2_SB_BSIZE_OFFSET 0x18
90#define EXT2_MIN_BLOCK_SIZE 1024
91#define EXT2_MAX_BLOCK_SIZE 4096
92#define EXT2_MIN_BLOCK_LOG_SIZE 10
93#ifdef __KERNEL__
94# define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize)
95#else
96# define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
97#endif
98#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
99#ifdef __KERNEL__
100# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits)
101#else
102# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10)
103#endif
104#ifdef __KERNEL__
105#define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_addr_per_block_bits)
106#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size)
107#define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino)
108#else
109#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
110 EXT2_GOOD_OLD_INODE_SIZE : \
111 (s)->s_inode_size)
112#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
113 EXT2_GOOD_OLD_FIRST_INO : \
114 (s)->s_first_ino)
115#endif
116 32
117/* 33static inline u64 ext2_image_size(void *ext2_sb)
118 * Macro-instructions used to manage fragments
119 */
120#define EXT2_MIN_FRAG_SIZE 1024
121#define EXT2_MAX_FRAG_SIZE 4096
122#define EXT2_MIN_FRAG_LOG_SIZE 10
123#ifdef __KERNEL__
124# define EXT2_FRAG_SIZE(s) (EXT2_SB(s)->s_frag_size)
125# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_SB(s)->s_frags_per_block)
126#else
127# define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size)
128# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s))
129#endif
130
131/*
132 * Structure of a blocks group descriptor
133 */
134struct ext2_group_desc
135{ 34{
136 __le32 bg_block_bitmap; /* Blocks bitmap block */ 35 __u8 *p = ext2_sb;
137 __le32 bg_inode_bitmap; /* Inodes bitmap block */ 36 if (*(__le16 *)(p + EXT2_SB_MAGIC_OFFSET) != cpu_to_le16(EXT2_SUPER_MAGIC))
138 __le32 bg_inode_table; /* Inodes table block */ 37 return 0;
139 __le16 bg_free_blocks_count; /* Free blocks count */ 38 return (u64)le32_to_cpup((__le32 *)(p + EXT2_SB_BLOCKS_OFFSET)) <<
140 __le16 bg_free_inodes_count; /* Free inodes count */ 39 le32_to_cpup((__le32 *)(p + EXT2_SB_BSIZE_OFFSET));
141 __le16 bg_used_dirs_count; /* Directories count */
142 __le16 bg_pad;
143 __le32 bg_reserved[3];
144};
145
146/*
147 * Macro-instructions used to manage group descriptors
148 */
149#ifdef __KERNEL__
150# define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group)
151# define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block)
152# define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group)
153# define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits)
154#else
155# define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group)
156# define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc))
157# define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group)
158#endif
159
160/*
161 * Constants relative to the data blocks
162 */
163#define EXT2_NDIR_BLOCKS 12
164#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS
165#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1)
166#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1)
167#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1)
168
169/*
170 * Inode flags (GETFLAGS/SETFLAGS)
171 */
172#define EXT2_SECRM_FL FS_SECRM_FL /* Secure deletion */
173#define EXT2_UNRM_FL FS_UNRM_FL /* Undelete */
174#define EXT2_COMPR_FL FS_COMPR_FL /* Compress file */
175#define EXT2_SYNC_FL FS_SYNC_FL /* Synchronous updates */
176#define EXT2_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */
177#define EXT2_APPEND_FL FS_APPEND_FL /* writes to file may only append */
178#define EXT2_NODUMP_FL FS_NODUMP_FL /* do not dump file */
179#define EXT2_NOATIME_FL FS_NOATIME_FL /* do not update atime */
180/* Reserved for compression usage... */
181#define EXT2_DIRTY_FL FS_DIRTY_FL
182#define EXT2_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */
183#define EXT2_NOCOMP_FL FS_NOCOMP_FL /* Don't compress */
184#define EXT2_ECOMPR_FL FS_ECOMPR_FL /* Compression error */
185/* End compression flags --- maybe not all used */
186#define EXT2_BTREE_FL FS_BTREE_FL /* btree format dir */
187#define EXT2_INDEX_FL FS_INDEX_FL /* hash-indexed directory */
188#define EXT2_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */
189#define EXT2_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* Reserved for ext3 */
190#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
191#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
192#define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
193#define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
194
195#define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
196#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
197
198/* Flags that should be inherited by new inodes from their parent. */
199#define EXT2_FL_INHERITED (EXT2_SECRM_FL | EXT2_UNRM_FL | EXT2_COMPR_FL |\
200 EXT2_SYNC_FL | EXT2_NODUMP_FL |\
201 EXT2_NOATIME_FL | EXT2_COMPRBLK_FL |\
202 EXT2_NOCOMP_FL | EXT2_JOURNAL_DATA_FL |\
203 EXT2_NOTAIL_FL | EXT2_DIRSYNC_FL)
204
205/* Flags that are appropriate for regular files (all but dir-specific ones). */
206#define EXT2_REG_FLMASK (~(EXT2_DIRSYNC_FL | EXT2_TOPDIR_FL))
207
208/* Flags that are appropriate for non-directories/regular files. */
209#define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL)
210
211/* Mask out flags that are inappropriate for the given type of inode. */
212static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
213{
214 if (S_ISDIR(mode))
215 return flags;
216 else if (S_ISREG(mode))
217 return flags & EXT2_REG_FLMASK;
218 else
219 return flags & EXT2_OTHER_FLMASK;
220} 40}
221 41
222/*
223 * ioctl commands
224 */
225#define EXT2_IOC_GETFLAGS FS_IOC_GETFLAGS
226#define EXT2_IOC_SETFLAGS FS_IOC_SETFLAGS
227#define EXT2_IOC_GETVERSION FS_IOC_GETVERSION
228#define EXT2_IOC_SETVERSION FS_IOC_SETVERSION
229#define EXT2_IOC_GETRSVSZ _IOR('f', 5, long)
230#define EXT2_IOC_SETRSVSZ _IOW('f', 6, long)
231
232/*
233 * ioctl commands in 32 bit emulation
234 */
235#define EXT2_IOC32_GETFLAGS FS_IOC32_GETFLAGS
236#define EXT2_IOC32_SETFLAGS FS_IOC32_SETFLAGS
237#define EXT2_IOC32_GETVERSION FS_IOC32_GETVERSION
238#define EXT2_IOC32_SETVERSION FS_IOC32_SETVERSION
239
240/*
241 * Structure of an inode on the disk
242 */
243struct ext2_inode {
244 __le16 i_mode; /* File mode */
245 __le16 i_uid; /* Low 16 bits of Owner Uid */
246 __le32 i_size; /* Size in bytes */
247 __le32 i_atime; /* Access time */
248 __le32 i_ctime; /* Creation time */
249 __le32 i_mtime; /* Modification time */
250 __le32 i_dtime; /* Deletion Time */
251 __le16 i_gid; /* Low 16 bits of Group Id */
252 __le16 i_links_count; /* Links count */
253 __le32 i_blocks; /* Blocks count */
254 __le32 i_flags; /* File flags */
255 union {
256 struct {
257 __le32 l_i_reserved1;
258 } linux1;
259 struct {
260 __le32 h_i_translator;
261 } hurd1;
262 struct {
263 __le32 m_i_reserved1;
264 } masix1;
265 } osd1; /* OS dependent 1 */
266 __le32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
267 __le32 i_generation; /* File version (for NFS) */
268 __le32 i_file_acl; /* File ACL */
269 __le32 i_dir_acl; /* Directory ACL */
270 __le32 i_faddr; /* Fragment address */
271 union {
272 struct {
273 __u8 l_i_frag; /* Fragment number */
274 __u8 l_i_fsize; /* Fragment size */
275 __u16 i_pad1;
276 __le16 l_i_uid_high; /* these 2 fields */
277 __le16 l_i_gid_high; /* were reserved2[0] */
278 __u32 l_i_reserved2;
279 } linux2;
280 struct {
281 __u8 h_i_frag; /* Fragment number */
282 __u8 h_i_fsize; /* Fragment size */
283 __le16 h_i_mode_high;
284 __le16 h_i_uid_high;
285 __le16 h_i_gid_high;
286 __le32 h_i_author;
287 } hurd2;
288 struct {
289 __u8 m_i_frag; /* Fragment number */
290 __u8 m_i_fsize; /* Fragment size */
291 __u16 m_pad1;
292 __u32 m_i_reserved2[2];
293 } masix2;
294 } osd2; /* OS dependent 2 */
295};
296
297#define i_size_high i_dir_acl
298
299#if defined(__KERNEL__) || defined(__linux__)
300#define i_reserved1 osd1.linux1.l_i_reserved1
301#define i_frag osd2.linux2.l_i_frag
302#define i_fsize osd2.linux2.l_i_fsize
303#define i_uid_low i_uid
304#define i_gid_low i_gid
305#define i_uid_high osd2.linux2.l_i_uid_high
306#define i_gid_high osd2.linux2.l_i_gid_high
307#define i_reserved2 osd2.linux2.l_i_reserved2
308#endif
309
310#ifdef __hurd__
311#define i_translator osd1.hurd1.h_i_translator
312#define i_frag osd2.hurd2.h_i_frag
313#define i_fsize osd2.hurd2.h_i_fsize
314#define i_uid_high osd2.hurd2.h_i_uid_high
315#define i_gid_high osd2.hurd2.h_i_gid_high
316#define i_author osd2.hurd2.h_i_author
317#endif
318
319#ifdef __masix__
320#define i_reserved1 osd1.masix1.m_i_reserved1
321#define i_frag osd2.masix2.m_i_frag
322#define i_fsize osd2.masix2.m_i_fsize
323#define i_reserved2 osd2.masix2.m_i_reserved2
324#endif
325
326/*
327 * File system states
328 */
329#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */
330#define EXT2_ERROR_FS 0x0002 /* Errors detected */
331
332/*
333 * Mount flags
334 */
335#define EXT2_MOUNT_CHECK 0x000001 /* Do mount-time checks */
336#define EXT2_MOUNT_OLDALLOC 0x000002 /* Don't use the new Orlov allocator */
337#define EXT2_MOUNT_GRPID 0x000004 /* Create files with directory's group */
338#define EXT2_MOUNT_DEBUG 0x000008 /* Some debugging messages */
339#define EXT2_MOUNT_ERRORS_CONT 0x000010 /* Continue on errors */
340#define EXT2_MOUNT_ERRORS_RO 0x000020 /* Remount fs ro on errors */
341#define EXT2_MOUNT_ERRORS_PANIC 0x000040 /* Panic on errors */
342#define EXT2_MOUNT_MINIX_DF 0x000080 /* Mimics the Minix statfs */
343#define EXT2_MOUNT_NOBH 0x000100 /* No buffer_heads */
344#define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */
345#define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */
346#define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */
347#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */
348#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
349#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
350#define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
351
352
353#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
354#define set_opt(o, opt) o |= EXT2_MOUNT_##opt
355#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \
356 EXT2_MOUNT_##opt)
357/*
358 * Maximal mount counts between two filesystem checks
359 */
360#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */
361#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */
362
363/*
364 * Behaviour when detecting errors
365 */
366#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */
367#define EXT2_ERRORS_RO 2 /* Remount fs read-only */
368#define EXT2_ERRORS_PANIC 3 /* Panic */
369#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE
370
371/*
372 * Structure of the super block
373 */
374struct ext2_super_block {
375 __le32 s_inodes_count; /* Inodes count */
376 __le32 s_blocks_count; /* Blocks count */
377 __le32 s_r_blocks_count; /* Reserved blocks count */
378 __le32 s_free_blocks_count; /* Free blocks count */
379 __le32 s_free_inodes_count; /* Free inodes count */
380 __le32 s_first_data_block; /* First Data Block */
381 __le32 s_log_block_size; /* Block size */
382 __le32 s_log_frag_size; /* Fragment size */
383 __le32 s_blocks_per_group; /* # Blocks per group */
384 __le32 s_frags_per_group; /* # Fragments per group */
385 __le32 s_inodes_per_group; /* # Inodes per group */
386 __le32 s_mtime; /* Mount time */
387 __le32 s_wtime; /* Write time */
388 __le16 s_mnt_count; /* Mount count */
389 __le16 s_max_mnt_count; /* Maximal mount count */
390 __le16 s_magic; /* Magic signature */
391 __le16 s_state; /* File system state */
392 __le16 s_errors; /* Behaviour when detecting errors */
393 __le16 s_minor_rev_level; /* minor revision level */
394 __le32 s_lastcheck; /* time of last check */
395 __le32 s_checkinterval; /* max. time between checks */
396 __le32 s_creator_os; /* OS */
397 __le32 s_rev_level; /* Revision level */
398 __le16 s_def_resuid; /* Default uid for reserved blocks */
399 __le16 s_def_resgid; /* Default gid for reserved blocks */
400 /*
401 * These fields are for EXT2_DYNAMIC_REV superblocks only.
402 *
403 * Note: the difference between the compatible feature set and
404 * the incompatible feature set is that if there is a bit set
405 * in the incompatible feature set that the kernel doesn't
406 * know about, it should refuse to mount the filesystem.
407 *
408 * e2fsck's requirements are more strict; if it doesn't know
409 * about a feature in either the compatible or incompatible
410 * feature set, it must abort and not try to meddle with
411 * things it doesn't understand...
412 */
413 __le32 s_first_ino; /* First non-reserved inode */
414 __le16 s_inode_size; /* size of inode structure */
415 __le16 s_block_group_nr; /* block group # of this superblock */
416 __le32 s_feature_compat; /* compatible feature set */
417 __le32 s_feature_incompat; /* incompatible feature set */
418 __le32 s_feature_ro_compat; /* readonly-compatible feature set */
419 __u8 s_uuid[16]; /* 128-bit uuid for volume */
420 char s_volume_name[16]; /* volume name */
421 char s_last_mounted[64]; /* directory where last mounted */
422 __le32 s_algorithm_usage_bitmap; /* For compression */
423 /*
424 * Performance hints. Directory preallocation should only
425 * happen if the EXT2_COMPAT_PREALLOC flag is on.
426 */
427 __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
428 __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
429 __u16 s_padding1;
430 /*
431 * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set.
432 */
433 __u8 s_journal_uuid[16]; /* uuid of journal superblock */
434 __u32 s_journal_inum; /* inode number of journal file */
435 __u32 s_journal_dev; /* device number of journal file */
436 __u32 s_last_orphan; /* start of list of inodes to delete */
437 __u32 s_hash_seed[4]; /* HTREE hash seed */
438 __u8 s_def_hash_version; /* Default hash version to use */
439 __u8 s_reserved_char_pad;
440 __u16 s_reserved_word_pad;
441 __le32 s_default_mount_opts;
442 __le32 s_first_meta_bg; /* First metablock block group */
443 __u32 s_reserved[190]; /* Padding to the end of the block */
444};
445
446/*
447 * Codes for operating systems
448 */
449#define EXT2_OS_LINUX 0
450#define EXT2_OS_HURD 1
451#define EXT2_OS_MASIX 2
452#define EXT2_OS_FREEBSD 3
453#define EXT2_OS_LITES 4
454
455/*
456 * Revision levels
457 */
458#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */
459#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */
460
461#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV
462#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV
463
464#define EXT2_GOOD_OLD_INODE_SIZE 128
465
466/*
467 * Feature set definitions
468 */
469
470#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \
471 ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) )
472#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \
473 ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) )
474#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \
475 ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) )
476#define EXT2_SET_COMPAT_FEATURE(sb,mask) \
477 EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask)
478#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask) \
479 EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask)
480#define EXT2_SET_INCOMPAT_FEATURE(sb,mask) \
481 EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask)
482#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask) \
483 EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask)
484#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask) \
485 EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask)
486#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask) \
487 EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask)
488
489#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001
490#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002
491#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004
492#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008
493#define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010
494#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020
495#define EXT2_FEATURE_COMPAT_ANY 0xffffffff
496
497#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
498#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
499#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
500#define EXT2_FEATURE_RO_COMPAT_ANY 0xffffffff
501
502#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001
503#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
504#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004
505#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008
506#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010
507#define EXT2_FEATURE_INCOMPAT_ANY 0xffffffff
508
509#define EXT2_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
510#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
511 EXT2_FEATURE_INCOMPAT_META_BG)
512#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
513 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
514 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
515#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP
516#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP
517
518/*
519 * Default values for user and/or group using reserved blocks
520 */
521#define EXT2_DEF_RESUID 0
522#define EXT2_DEF_RESGID 0
523
524/*
525 * Default mount options
526 */
527#define EXT2_DEFM_DEBUG 0x0001
528#define EXT2_DEFM_BSDGROUPS 0x0002
529#define EXT2_DEFM_XATTR_USER 0x0004
530#define EXT2_DEFM_ACL 0x0008
531#define EXT2_DEFM_UID16 0x0010
532 /* Not used by ext2, but reserved for use by ext3 */
533#define EXT3_DEFM_JMODE 0x0060
534#define EXT3_DEFM_JMODE_DATA 0x0020
535#define EXT3_DEFM_JMODE_ORDERED 0x0040
536#define EXT3_DEFM_JMODE_WBACK 0x0060
537
538/*
539 * Structure of a directory entry
540 */
541#define EXT2_NAME_LEN 255
542
543struct ext2_dir_entry {
544 __le32 inode; /* Inode number */
545 __le16 rec_len; /* Directory entry length */
546 __le16 name_len; /* Name length */
547 char name[EXT2_NAME_LEN]; /* File name */
548};
549
550/*
551 * The new version of the directory entry. Since EXT2 structures are
552 * stored in intel byte order, and the name_len field could never be
553 * bigger than 255 chars, it's safe to reclaim the extra byte for the
554 * file_type field.
555 */
556struct ext2_dir_entry_2 {
557 __le32 inode; /* Inode number */
558 __le16 rec_len; /* Directory entry length */
559 __u8 name_len; /* Name length */
560 __u8 file_type;
561 char name[EXT2_NAME_LEN]; /* File name */
562};
563
564/*
565 * Ext2 directory file types. Only the low 3 bits are used. The
566 * other bits are reserved for now.
567 */
568enum {
569 EXT2_FT_UNKNOWN = 0,
570 EXT2_FT_REG_FILE = 1,
571 EXT2_FT_DIR = 2,
572 EXT2_FT_CHRDEV = 3,
573 EXT2_FT_BLKDEV = 4,
574 EXT2_FT_FIFO = 5,
575 EXT2_FT_SOCK = 6,
576 EXT2_FT_SYMLINK = 7,
577 EXT2_FT_MAX
578};
579
580/*
581 * EXT2_DIR_PAD defines the directory entries boundaries
582 *
583 * NOTE: It must be a multiple of 4
584 */
585#define EXT2_DIR_PAD 4
586#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1)
587#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
588 ~EXT2_DIR_ROUND)
589#define EXT2_MAX_REC_LEN ((1<<16)-1)
590
591#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 */
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
deleted file mode 100644
index f42c098aed8d..000000000000
--- a/include/linux/ext3_fs_i.h
+++ /dev/null
@@ -1,151 +0,0 @@
1/*
2 * linux/include/linux/ext3_fs_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 _LINUX_EXT3_FS_I
17#define _LINUX_EXT3_FS_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 ext3_grpblk_t;
26
27/* data type for filesystem-wide blocks number */
28typedef unsigned long ext3_fsblk_t;
29
30#define E3FSBLK "%lu"
31
32struct ext3_reserve_window {
33 ext3_fsblk_t _rsv_start; /* First byte reserved */
34 ext3_fsblk_t _rsv_end; /* Last byte reserved or 0 */
35};
36
37struct ext3_reserve_window_node {
38 struct rb_node rsv_node;
39 __u32 rsv_goal_size;
40 __u32 rsv_alloc_hit;
41 struct ext3_reserve_window rsv_window;
42};
43
44struct ext3_block_alloc_info {
45 /* information about reservation window */
46 struct ext3_reserve_window_node rsv_window_node;
47 /*
48 * was i_next_alloc_block in ext3_inode_info
49 * is the logical (file-relative) number of the
50 * most-recently-allocated block in this file.
51 * We use this for detecting linearly ascending allocation requests.
52 */
53 __u32 last_alloc_logical_block;
54 /*
55 * Was i_next_alloc_goal in ext3_inode_info
56 * is the *physical* companion to i_next_alloc_block.
57 * it 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
59 * allocation when we detect linearly ascending requests.
60 */
61 ext3_fsblk_t last_alloc_physical_block;
62};
63
64#define rsv_start rsv_window._rsv_start
65#define rsv_end rsv_window._rsv_end
66
67/*
68 * third extended file system inode data in memory
69 */
70struct ext3_inode_info {
71 __le32 i_data[15]; /* unconverted */
72 __u32 i_flags;
73#ifdef EXT3_FRAGMENTS
74 __u32 i_faddr;
75 __u8 i_frag_no;
76 __u8 i_frag_size;
77#endif
78 ext3_fsblk_t i_file_acl;
79 __u32 i_dir_acl;
80 __u32 i_dtime;
81
82 /*
83 * i_block_group is the number of the block group which contains
84 * this file's inode. Constant across the lifetime of the inode,
85 * it is ued for making block allocation decisions - we try to
86 * place a file's data blocks near its inode block, and new inodes
87 * near to their parent directory's inode.
88 */
89 __u32 i_block_group;
90 unsigned long i_state_flags; /* Dynamic state flags for ext3 */
91
92 /* block reservation info */
93 struct ext3_block_alloc_info *i_block_alloc_info;
94
95 __u32 i_dir_start_lookup;
96#ifdef CONFIG_EXT3_FS_XATTR
97 /*
98 * Extended attributes can be read independently of the main file
99 * data. Taking i_mutex even when reading would cause contention
100 * between readers of EAs and writers of regular file data, so
101 * instead we synchronize on xattr_sem when reading or changing
102 * EAs.
103 */
104 struct rw_semaphore xattr_sem;
105#endif
106
107 struct list_head i_orphan; /* unlinked but open inodes */
108
109 /*
110 * i_disksize keeps track of what the inode size is ON DISK, not
111 * in memory. During truncate, i_size is set to the new size by
112 * the VFS prior to calling ext3_truncate(), but the filesystem won't
113 * set i_disksize to 0 until the truncate is actually under way.
114 *
115 * The intent is that i_disksize always represents the blocks which
116 * are used by this file. This allows recovery to restart truncate
117 * on orphans if we crash during truncate. We actually write i_disksize
118 * into the on-disk inode when writing inodes out, instead of i_size.
119 *
120 * The only time when i_disksize and i_size may be different is when
121 * a truncate is in progress. The only things which change i_disksize
122 * are ext3_get_block (growth) and ext3_truncate (shrinkth).
123 */
124 loff_t i_disksize;
125
126 /* on-disk additional length */
127 __u16 i_extra_isize;
128
129 /*
130 * truncate_mutex is for serialising ext3_truncate() against
131 * ext3_getblock(). In the 2.4 ext2 design, great chunks of inode's
132 * data tree are chopped off during truncate. We can't do that in
133 * ext3 because whenever we perform intermediate commits during
134 * truncate, the inode and all the metadata blocks *must* be in a
135 * consistent state which allows truncation of the orphans to restart
136 * during recovery. Hence we must fix the get_block-vs-truncate race
137 * by other means, so we have truncate_mutex.
138 */
139 struct mutex truncate_mutex;
140
141 /*
142 * Transactions that contain inode's metadata needed to complete
143 * fsync and fdatasync, respectively.
144 */
145 atomic_t i_sync_tid;
146 atomic_t i_datasync_tid;
147
148 struct inode vfs_inode;
149};
150
151#endif /* _LINUX_EXT3_FS_I */
diff --git a/include/linux/ext3_fs_sb.h b/include/linux/ext3_fs_sb.h
deleted file mode 100644
index 64365252f1b0..000000000000
--- a/include/linux/ext3_fs_sb.h
+++ /dev/null
@@ -1,91 +0,0 @@
1/*
2 * linux/include/linux/ext3_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_EXT3_FS_SB
17#define _LINUX_EXT3_FS_SB
18
19#ifdef __KERNEL__
20#include <linux/timer.h>
21#include <linux/wait.h>
22#include <linux/blockgroup_lock.h>
23#include <linux/percpu_counter.h>
24#endif
25#include <linux/rbtree.h>
26
27/*
28 * third extended-fs super-block data in memory
29 */
30struct ext3_sb_info {
31 unsigned long s_frag_size; /* Size of a fragment in bytes */
32 unsigned long s_frags_per_block;/* Number of fragments per block */
33 unsigned long s_inodes_per_block;/* Number of inodes per block */
34 unsigned long s_frags_per_group;/* Number of fragments in a group */
35 unsigned long s_blocks_per_group;/* Number of blocks in a group */
36 unsigned long s_inodes_per_group;/* Number of inodes in a group */
37 unsigned long s_itb_per_group; /* Number of inode table blocks per group */
38 unsigned long s_gdb_count; /* Number of group descriptor blocks */
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 */
41 unsigned long s_overhead_last; /* Last calculated overhead */
42 unsigned long s_blocks_last; /* Last seen block count */
43 struct buffer_head * s_sbh; /* Buffer containing the super block */
44 struct ext3_super_block * s_es; /* Pointer to the super block in the buffer */
45 struct buffer_head ** s_group_desc;
46 unsigned long s_mount_opt;
47 ext3_fsblk_t s_sb_block;
48 uid_t s_resuid;
49 gid_t s_resgid;
50 unsigned short s_mount_state;
51 unsigned short s_pad;
52 int s_addr_per_block_bits;
53 int s_desc_per_block_bits;
54 int s_inode_size;
55 int s_first_ino;
56 spinlock_t s_next_gen_lock;
57 u32 s_next_generation;
58 u32 s_hash_seed[4];
59 int s_def_hash_version;
60 int s_hash_unsigned; /* 3 if hash should be signed, 0 if not */
61 struct percpu_counter s_freeblocks_counter;
62 struct percpu_counter s_freeinodes_counter;
63 struct percpu_counter s_dirs_counter;
64 struct blockgroup_lock *s_blockgroup_lock;
65
66 /* root of the per fs reservation window tree */
67 spinlock_t s_rsv_window_lock;
68 struct rb_root s_rsv_window_root;
69 struct ext3_reserve_window_node s_rsv_window_head;
70
71 /* Journaling */
72 struct inode * s_journal_inode;
73 struct journal_s * s_journal;
74 struct list_head s_orphan;
75 struct mutex s_orphan_lock;
76 struct mutex s_resize_lock;
77 unsigned long s_commit_interval;
78 struct block_device *journal_bdev;
79#ifdef CONFIG_QUOTA
80 char *s_qf_names[MAXQUOTAS]; /* Names of quota files with journalled quota */
81 int s_jquota_fmt; /* Format of quota to use */
82#endif
83};
84
85static inline spinlock_t *
86sb_bgl_lock(struct ext3_sb_info *sbi, unsigned int block_group)
87{
88 return bgl_lock_ptr(sbi->s_blockgroup_lock, block_group);
89}
90
91#endif /* _LINUX_EXT3_FS_SB */
diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h
deleted file mode 100644
index d7b5ddca99c2..000000000000
--- a/include/linux/ext3_jbd.h
+++ /dev/null
@@ -1,229 +0,0 @@
1/*
2 * linux/include/linux/ext3_jbd.h
3 *
4 * Written by Stephen C. Tweedie <sct@redhat.com>, 1999
5 *
6 * Copyright 1998--1999 Red Hat corp --- All Rights Reserved
7 *
8 * This file is part of the Linux kernel and is made available under
9 * the terms of the GNU General Public License, version 2, or at your
10 * option, any later version, incorporated herein by reference.
11 *
12 * Ext3-specific journaling extensions.
13 */
14
15#ifndef _LINUX_EXT3_JBD_H
16#define _LINUX_EXT3_JBD_H
17
18#include <linux/fs.h>
19#include <linux/jbd.h>
20#include <linux/ext3_fs.h>
21
22#define EXT3_JOURNAL(inode) (EXT3_SB((inode)->i_sb)->s_journal)
23
24/* Define the number of blocks we need to account to a transaction to
25 * modify one block of data.
26 *
27 * We may have to touch one inode, one bitmap buffer, up to three
28 * indirection blocks, the group and superblock summaries, and the data
29 * block to complete the transaction. */
30
31#define EXT3_SINGLEDATA_TRANS_BLOCKS 8U
32
33/* Extended attribute operations touch at most two data buffers,
34 * two bitmap buffers, and two group summaries, in addition to the inode
35 * and the superblock, which are already accounted for. */
36
37#define EXT3_XATTR_TRANS_BLOCKS 6U
38
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
41 * quota files too (one for the group, one for the user quota). The
42 * superblock only gets updated once, of course, so don't bother
43 * counting that again for the quota updates. */
44
45#define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \
46 EXT3_XATTR_TRANS_BLOCKS - 2 + \
47 EXT3_MAXQUOTAS_TRANS_BLOCKS(sb))
48
49/* Delete operations potentially hit one directory's namespace plus an
50 * entire inode, plus arbitrary amounts of bitmap/indirection data. Be
51 * generous. We can grow the delete transaction later if necessary. */
52
53#define EXT3_DELETE_TRANS_BLOCKS(sb) (EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) + 64)
54
55/* Define an arbitrary limit for the amount of data we will anticipate
56 * writing to any given transaction. For unbounded transactions such as
57 * write(2) and truncate(2) we can write more than this, but we always
58 * start off at the maximum transaction size and grow the transaction
59 * optimistically as we go. */
60
61#define EXT3_MAX_TRANS_DATA 64U
62
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
65 * transaction or to start a new one. Reserve enough space here for
66 * inode, bitmap, superblock, group and indirection updates for at least
67 * one block, plus two quota updates. Quota allocations are not
68 * needed. */
69
70#define EXT3_RESERVE_TRANS_BLOCKS 12U
71
72#define EXT3_INDEX_EXTRA_TRANS_BLOCKS 8
73
74#ifdef CONFIG_QUOTA
75/* Amount of blocks needed for quota update - we know that the structure was
76 * allocated so we need to update only inode+data */
77#define EXT3_QUOTA_TRANS_BLOCKS(sb) (test_opt(sb, QUOTA) ? 2 : 0)
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 */
80#define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_INIT_ALLOC*\
81 (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
82#define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_DEL_ALLOC*\
83 (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
84#else
85#define EXT3_QUOTA_TRANS_BLOCKS(sb) 0
86#define EXT3_QUOTA_INIT_BLOCKS(sb) 0
87#define EXT3_QUOTA_DEL_BLOCKS(sb) 0
88#endif
89#define EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb))
90#define EXT3_MAXQUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb))
91#define EXT3_MAXQUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb))
92
93int
94ext3_mark_iloc_dirty(handle_t *handle,
95 struct inode *inode,
96 struct ext3_iloc *iloc);
97
98/*
99 * On success, We end up with an outstanding reference count against
100 * iloc->bh. This _must_ be cleaned up later.
101 */
102
103int ext3_reserve_inode_write(handle_t *handle, struct inode *inode,
104 struct ext3_iloc *iloc);
105
106int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode);
107
108/*
109 * Wrapper functions with which ext3 calls into JBD. The intent here is
110 * to allow these to be turned into appropriate stubs so ext3 can control
111 * ext2 filesystems, so ext2+ext3 systems only nee one fs. This work hasn't
112 * been done yet.
113 */
114
115static inline void ext3_journal_release_buffer(handle_t *handle,
116 struct buffer_head *bh)
117{
118 journal_release_buffer(handle, bh);
119}
120
121void ext3_journal_abort_handle(const char *caller, const char *err_fn,
122 struct buffer_head *bh, handle_t *handle, int err);
123
124int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
125 struct buffer_head *bh);
126
127int __ext3_journal_get_write_access(const char *where, handle_t *handle,
128 struct buffer_head *bh);
129
130int __ext3_journal_forget(const char *where, handle_t *handle,
131 struct buffer_head *bh);
132
133int __ext3_journal_revoke(const char *where, handle_t *handle,
134 unsigned long blocknr, struct buffer_head *bh);
135
136int __ext3_journal_get_create_access(const char *where,
137 handle_t *handle, struct buffer_head *bh);
138
139int __ext3_journal_dirty_metadata(const char *where,
140 handle_t *handle, struct buffer_head *bh);
141
142#define ext3_journal_get_undo_access(handle, bh) \
143 __ext3_journal_get_undo_access(__func__, (handle), (bh))
144#define ext3_journal_get_write_access(handle, bh) \
145 __ext3_journal_get_write_access(__func__, (handle), (bh))
146#define ext3_journal_revoke(handle, blocknr, bh) \
147 __ext3_journal_revoke(__func__, (handle), (blocknr), (bh))
148#define ext3_journal_get_create_access(handle, bh) \
149 __ext3_journal_get_create_access(__func__, (handle), (bh))
150#define ext3_journal_dirty_metadata(handle, bh) \
151 __ext3_journal_dirty_metadata(__func__, (handle), (bh))
152#define ext3_journal_forget(handle, bh) \
153 __ext3_journal_forget(__func__, (handle), (bh))
154
155int ext3_journal_dirty_data(handle_t *handle, struct buffer_head *bh);
156
157handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks);
158int __ext3_journal_stop(const char *where, handle_t *handle);
159
160static inline handle_t *ext3_journal_start(struct inode *inode, int nblocks)
161{
162 return ext3_journal_start_sb(inode->i_sb, nblocks);
163}
164
165#define ext3_journal_stop(handle) \
166 __ext3_journal_stop(__func__, (handle))
167
168static inline handle_t *ext3_journal_current_handle(void)
169{
170 return journal_current_handle();
171}
172
173static inline int ext3_journal_extend(handle_t *handle, int nblocks)
174{
175 return journal_extend(handle, nblocks);
176}
177
178static inline int ext3_journal_restart(handle_t *handle, int nblocks)
179{
180 return journal_restart(handle, nblocks);
181}
182
183static inline int ext3_journal_blocks_per_page(struct inode *inode)
184{
185 return journal_blocks_per_page(inode);
186}
187
188static inline int ext3_journal_force_commit(journal_t *journal)
189{
190 return journal_force_commit(journal);
191}
192
193/* super.c */
194int ext3_force_commit(struct super_block *sb);
195
196static inline int ext3_should_journal_data(struct inode *inode)
197{
198 if (!S_ISREG(inode->i_mode))
199 return 1;
200 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA)
201 return 1;
202 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL)
203 return 1;
204 return 0;
205}
206
207static inline int ext3_should_order_data(struct inode *inode)
208{
209 if (!S_ISREG(inode->i_mode))
210 return 0;
211 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL)
212 return 0;
213 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA)
214 return 1;
215 return 0;
216}
217
218static inline int ext3_should_writeback_data(struct inode *inode)
219{
220 if (!S_ISREG(inode->i_mode))
221 return 0;
222 if (EXT3_I(inode)->i_flags & EXT3_JOURNAL_DATA_FL)
223 return 0;
224 if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_WRITEBACK_DATA)
225 return 1;
226 return 0;
227}
228
229#endif /* _LINUX_EXT3_JBD_H */
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 3098a38f3ae1..9047330c73e9 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -2,7 +2,6 @@
2#include <linux/kernel.h> 2#include <linux/kernel.h>
3#include <linux/fs.h> 3#include <linux/fs.h>
4#include <linux/minix_fs.h> 4#include <linux/minix_fs.h>
5#include <linux/ext2_fs.h>
6#include <linux/romfs_fs.h> 5#include <linux/romfs_fs.h>
7#include <linux/initrd.h> 6#include <linux/initrd.h>
8#include <linux/sched.h> 7#include <linux/sched.h>
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 01f1306aa26e..6212586df29a 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -54,20 +54,19 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
54{ 54{
55 const int size = 512; 55 const int size = 512;
56 struct minix_super_block *minixsb; 56 struct minix_super_block *minixsb;
57 struct ext2_super_block *ext2sb;
58 struct romfs_super_block *romfsb; 57 struct romfs_super_block *romfsb;
59 struct cramfs_super *cramfsb; 58 struct cramfs_super *cramfsb;
60 struct squashfs_super_block *squashfsb; 59 struct squashfs_super_block *squashfsb;
61 int nblocks = -1; 60 int nblocks = -1;
62 unsigned char *buf; 61 unsigned char *buf;
63 const char *compress_name; 62 const char *compress_name;
63 unsigned long n;
64 64
65 buf = kmalloc(size, GFP_KERNEL); 65 buf = kmalloc(size, GFP_KERNEL);
66 if (!buf) 66 if (!buf)
67 return -ENOMEM; 67 return -ENOMEM;
68 68
69 minixsb = (struct minix_super_block *) buf; 69 minixsb = (struct minix_super_block *) buf;
70 ext2sb = (struct ext2_super_block *) buf;
71 romfsb = (struct romfs_super_block *) buf; 70 romfsb = (struct romfs_super_block *) buf;
72 cramfsb = (struct cramfs_super *) buf; 71 cramfsb = (struct cramfs_super *) buf;
73 squashfsb = (struct squashfs_super_block *) buf; 72 squashfsb = (struct squashfs_super_block *) buf;
@@ -150,12 +149,12 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
150 } 149 }
151 150
152 /* Try ext2 */ 151 /* Try ext2 */
153 if (ext2sb->s_magic == cpu_to_le16(EXT2_SUPER_MAGIC)) { 152 n = ext2_image_size(buf);
153 if (n) {
154 printk(KERN_NOTICE 154 printk(KERN_NOTICE
155 "RAMDISK: ext2 filesystem found at block %d\n", 155 "RAMDISK: ext2 filesystem found at block %d\n",
156 start_block); 156 start_block);
157 nblocks = le32_to_cpu(ext2sb->s_blocks_count) << 157 nblocks = n;
158 le32_to_cpu(ext2sb->s_log_block_size);
159 goto done; 158 goto done;
160 } 159 }
161 160
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 15c6c567468b..28482f9e15b8 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -28,7 +28,6 @@
28#include <linux/kernel.h> 28#include <linux/kernel.h>
29#include <linux/tracehook.h> 29#include <linux/tracehook.h>
30#include <linux/errno.h> 30#include <linux/errno.h>
31#include <linux/ext2_fs.h>
32#include <linux/sched.h> 31#include <linux/sched.h>
33#include <linux/security.h> 32#include <linux/security.h>
34#include <linux/xattr.h> 33#include <linux/xattr.h>
@@ -2971,15 +2970,15 @@ static int selinux_file_ioctl(struct file *file, unsigned int cmd,
2971 /* fall through */ 2970 /* fall through */
2972 case FIGETBSZ: 2971 case FIGETBSZ:
2973 /* fall through */ 2972 /* fall through */
2974 case EXT2_IOC_GETFLAGS: 2973 case FS_IOC_GETFLAGS:
2975 /* fall through */ 2974 /* fall through */
2976 case EXT2_IOC_GETVERSION: 2975 case FS_IOC_GETVERSION:
2977 error = file_has_perm(cred, file, FILE__GETATTR); 2976 error = file_has_perm(cred, file, FILE__GETATTR);
2978 break; 2977 break;
2979 2978
2980 case EXT2_IOC_SETFLAGS: 2979 case FS_IOC_SETFLAGS:
2981 /* fall through */ 2980 /* fall through */
2982 case EXT2_IOC_SETVERSION: 2981 case FS_IOC_SETVERSION:
2983 error = file_has_perm(cred, file, FILE__SETATTR); 2982 error = file_has_perm(cred, file, FILE__SETATTR);
2984 break; 2983 break;
2985 2984
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 48a7d0014b4f..d7018bfa1f00 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -344,7 +344,7 @@ static int sel_make_classes(void);
344static int sel_make_policycap(void); 344static int sel_make_policycap(void);
345 345
346/* declaration for sel_make_class_dirs */ 346/* declaration for sel_make_class_dirs */
347static int sel_make_dir(struct inode *dir, struct dentry *dentry, 347static struct dentry *sel_make_dir(struct dentry *dir, const char *name,
348 unsigned long *ino); 348 unsigned long *ino);
349 349
350static ssize_t sel_read_mls(struct file *filp, char __user *buf, 350static ssize_t sel_read_mls(struct file *filp, char __user *buf,
@@ -1678,13 +1678,9 @@ static int sel_make_class_dir_entries(char *classname, int index,
1678 inode->i_ino = sel_class_to_ino(index); 1678 inode->i_ino = sel_class_to_ino(index);
1679 d_add(dentry, inode); 1679 d_add(dentry, inode);
1680 1680
1681 dentry = d_alloc_name(dir, "perms"); 1681 dentry = sel_make_dir(dir, "perms", &last_class_ino);
1682 if (!dentry) 1682 if (IS_ERR(dentry))
1683 return -ENOMEM; 1683 return PTR_ERR(dentry);
1684
1685 rc = sel_make_dir(dir->d_inode, dentry, &last_class_ino);
1686 if (rc)
1687 return rc;
1688 1684
1689 rc = sel_make_perm_files(classname, index, dentry); 1685 rc = sel_make_perm_files(classname, index, dentry);
1690 1686
@@ -1733,15 +1729,12 @@ static int sel_make_classes(void)
1733 for (i = 0; i < nclasses; i++) { 1729 for (i = 0; i < nclasses; i++) {
1734 struct dentry *class_name_dir; 1730 struct dentry *class_name_dir;
1735 1731
1736 rc = -ENOMEM; 1732 class_name_dir = sel_make_dir(class_dir, classes[i],
1737 class_name_dir = d_alloc_name(class_dir, classes[i]);
1738 if (!class_name_dir)
1739 goto out;
1740
1741 rc = sel_make_dir(class_dir->d_inode, class_name_dir,
1742 &last_class_ino); 1733 &last_class_ino);
1743 if (rc) 1734 if (IS_ERR(class_name_dir)) {
1735 rc = PTR_ERR(class_name_dir);
1744 goto out; 1736 goto out;
1737 }
1745 1738
1746 /* i+1 since class values are 1-indexed */ 1739 /* i+1 since class values are 1-indexed */
1747 rc = sel_make_class_dir_entries(classes[i], i + 1, 1740 rc = sel_make_class_dir_entries(classes[i], i + 1,
@@ -1787,14 +1780,20 @@ static int sel_make_policycap(void)
1787 return 0; 1780 return 0;
1788} 1781}
1789 1782
1790static int sel_make_dir(struct inode *dir, struct dentry *dentry, 1783static struct dentry *sel_make_dir(struct dentry *dir, const char *name,
1791 unsigned long *ino) 1784 unsigned long *ino)
1792{ 1785{
1786 struct dentry *dentry = d_alloc_name(dir, name);
1793 struct inode *inode; 1787 struct inode *inode;
1794 1788
1795 inode = sel_make_inode(dir->i_sb, S_IFDIR | S_IRUGO | S_IXUGO); 1789 if (!dentry)
1796 if (!inode) 1790 return ERR_PTR(-ENOMEM);
1797 return -ENOMEM; 1791
1792 inode = sel_make_inode(dir->d_sb, S_IFDIR | S_IRUGO | S_IXUGO);
1793 if (!inode) {
1794 dput(dentry);
1795 return ERR_PTR(-ENOMEM);
1796 }
1798 1797
1799 inode->i_op = &simple_dir_inode_operations; 1798 inode->i_op = &simple_dir_inode_operations;
1800 inode->i_fop = &simple_dir_operations; 1799 inode->i_fop = &simple_dir_operations;
@@ -1803,16 +1802,16 @@ static int sel_make_dir(struct inode *dir, struct dentry *dentry,
1803 inc_nlink(inode); 1802 inc_nlink(inode);
1804 d_add(dentry, inode); 1803 d_add(dentry, inode);
1805 /* bump link count on parent directory, too */ 1804 /* bump link count on parent directory, too */
1806 inc_nlink(dir); 1805 inc_nlink(dir->d_inode);
1807 1806
1808 return 0; 1807 return dentry;
1809} 1808}
1810 1809
1811static int sel_fill_super(struct super_block *sb, void *data, int silent) 1810static int sel_fill_super(struct super_block *sb, void *data, int silent)
1812{ 1811{
1813 int ret; 1812 int ret;
1814 struct dentry *dentry; 1813 struct dentry *dentry;
1815 struct inode *inode, *root_inode; 1814 struct inode *inode;
1816 struct inode_security_struct *isec; 1815 struct inode_security_struct *isec;
1817 1816
1818 static struct tree_descr selinux_files[] = { 1817 static struct tree_descr selinux_files[] = {
@@ -1839,18 +1838,12 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
1839 if (ret) 1838 if (ret)
1840 goto err; 1839 goto err;
1841 1840
1842 root_inode = sb->s_root->d_inode; 1841 bool_dir = sel_make_dir(sb->s_root, BOOL_DIR_NAME, &sel_last_ino);
1843 1842 if (IS_ERR(bool_dir)) {
1844 ret = -ENOMEM; 1843 ret = PTR_ERR(bool_dir);
1845 dentry = d_alloc_name(sb->s_root, BOOL_DIR_NAME); 1844 bool_dir = NULL;
1846 if (!dentry)
1847 goto err; 1845 goto err;
1848 1846 }
1849 ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
1850 if (ret)
1851 goto err;
1852
1853 bool_dir = dentry;
1854 1847
1855 ret = -ENOMEM; 1848 ret = -ENOMEM;
1856 dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME); 1849 dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME);
@@ -1872,54 +1865,39 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
1872 d_add(dentry, inode); 1865 d_add(dentry, inode);
1873 selinux_null = dentry; 1866 selinux_null = dentry;
1874 1867
1875 ret = -ENOMEM; 1868 dentry = sel_make_dir(sb->s_root, "avc", &sel_last_ino);
1876 dentry = d_alloc_name(sb->s_root, "avc"); 1869 if (IS_ERR(dentry)) {
1877 if (!dentry) 1870 ret = PTR_ERR(dentry);
1878 goto err;
1879
1880 ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
1881 if (ret)
1882 goto err; 1871 goto err;
1872 }
1883 1873
1884 ret = sel_make_avc_files(dentry); 1874 ret = sel_make_avc_files(dentry);
1885 if (ret) 1875 if (ret)
1886 goto err; 1876 goto err;
1887 1877
1888 ret = -ENOMEM; 1878 dentry = sel_make_dir(sb->s_root, "initial_contexts", &sel_last_ino);
1889 dentry = d_alloc_name(sb->s_root, "initial_contexts"); 1879 if (IS_ERR(dentry)) {
1890 if (!dentry) 1880 ret = PTR_ERR(dentry);
1891 goto err;
1892
1893 ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
1894 if (ret)
1895 goto err; 1881 goto err;
1882 }
1896 1883
1897 ret = sel_make_initcon_files(dentry); 1884 ret = sel_make_initcon_files(dentry);
1898 if (ret) 1885 if (ret)
1899 goto err; 1886 goto err;
1900 1887
1901 ret = -ENOMEM; 1888 class_dir = sel_make_dir(sb->s_root, "class", &sel_last_ino);
1902 dentry = d_alloc_name(sb->s_root, "class"); 1889 if (IS_ERR(class_dir)) {
1903 if (!dentry) 1890 ret = PTR_ERR(class_dir);
1904 goto err; 1891 class_dir = NULL;
1905
1906 ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
1907 if (ret)
1908 goto err;
1909
1910 class_dir = dentry;
1911
1912 ret = -ENOMEM;
1913 dentry = d_alloc_name(sb->s_root, "policy_capabilities");
1914 if (!dentry)
1915 goto err; 1892 goto err;
1893 }
1916 1894
1917 ret = sel_make_dir(root_inode, dentry, &sel_last_ino); 1895 policycap_dir = sel_make_dir(sb->s_root, "policy_capabilities", &sel_last_ino);
1918 if (ret) 1896 if (IS_ERR(policycap_dir)) {
1897 ret = PTR_ERR(policycap_dir);
1898 policycap_dir = NULL;
1919 goto err; 1899 goto err;
1920 1900 }
1921 policycap_dir = dentry;
1922
1923 return 0; 1901 return 0;
1924err: 1902err:
1925 printk(KERN_ERR "SELinux: %s: failed while creating inodes\n", 1903 printk(KERN_ERR "SELinux: %s: failed while creating inodes\n",
generated by cgit v1.2.2 (git 2.25.0) at 2026-03-10 09:20:05 -0400