1 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
2 index 3c41773..157438f 100644
5 @@ -1286,6 +1286,7 @@ struct ext4_sb_info {
6 unsigned long s_mb_prealloc_table_size;
7 unsigned int s_mb_group_prealloc;
8 unsigned int s_max_dir_size_kb;
9 + unsigned long s_warning_dir_size;
10 /* where last allocation was done - for stream allocation */
11 unsigned long s_mb_last_group;
12 unsigned long s_mb_last_start;
13 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
14 index 7e9e04a..094d54f 100644
17 @@ -687,12 +687,20 @@ struct ext4_dir_lock_data {
18 #define ext4_htree_lock_data(l) ((struct ext4_dir_lock_data *)(l)->lk_private)
19 #define ext4_find_entry(dir, name, dirent, inline) \
20 __ext4_find_entry(dir, name, dirent, inline, NULL)
21 -#define ext4_add_entry(handle, dentry, inode) \
22 - __ext4_add_entry(handle, dentry, inode, NULL)
24 /* NB: ext4_lblk_t is 32 bits so we use high bits to identify invalid blk */
25 #define EXT4_HTREE_NODE_CHANGED (0xcafeULL << 32)
27 +inline int ext4_add_entry(handle_t *handle, struct dentry *dentry,
28 + struct inode *inode)
30 + int ret = __ext4_add_entry(handle, dentry, inode, NULL);
32 + if (ret == -ENOBUFS)
37 static void ext4_htree_event_cb(void *target, void *event)
39 u64 *block = (u64 *)target;
40 @@ -2479,6 +2487,54 @@ int __ext4_add_entry(handle_t *handle, struct dentry *dentry,
42 EXPORT_SYMBOL(__ext4_add_entry);
44 +static unsigned long __ext4_max_dir_size(struct dx_frame *frames,
45 + struct dx_frame *frame, struct inode *dir)
47 + unsigned long max_dir_size;
49 + if (EXT4_SB(dir->i_sb)->s_max_dir_size_kb) {
50 + max_dir_size = EXT4_SB(dir->i_sb)->s_max_dir_size_kb << 10;
52 + max_dir_size = EXT4_BLOCK_SIZE(dir->i_sb);
53 + while (frame >= frames) {
54 + max_dir_size *= dx_get_limit(frame->entries);
55 + if (frame == frames)
59 + /* use 75% of max dir size in average */
60 + max_dir_size = max_dir_size / 4 * 3;
62 + return max_dir_size;
66 + * With hash tree growing, it is easy to hit ENOSPC, but it is hard
67 + * to predict when it will happen. let's give administrators warning
68 + * when reaching 3/5 and 2/3 of limit
70 +static inline bool dir_size_in_warning_range(struct dx_frame *frames,
71 + struct dx_frame *frame,
74 + unsigned long size1, size2;
75 + struct super_block *sb = dir->i_sb;
77 + if (unlikely(!EXT4_SB(sb)->s_warning_dir_size))
78 + EXT4_SB(sb)->s_warning_dir_size =
79 + __ext4_max_dir_size(frames, frame, dir);
81 + size1 = EXT4_SB(sb)->s_warning_dir_size / 16 * 10;
82 + size1 = size1 & ~(EXT4_BLOCK_SIZE(sb) - 1);
83 + size2 = EXT4_SB(sb)->s_warning_dir_size / 16 * 11;
84 + size2 = size2 & ~(EXT4_BLOCK_SIZE(sb) - 1);
85 + if (in_range(dir->i_size, size1, EXT4_BLOCK_SIZE(sb)) ||
86 + in_range(dir->i_size, size2, EXT4_BLOCK_SIZE(sb)))
93 * Returns 0 for success, or a negative error value
95 @@ -2494,6 +2550,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
96 struct ext4_dir_entry_2 *de;
99 + bool ret_warn = false;
103 @@ -2517,6 +2574,11 @@ again:
104 /* Block full, should compress but for now just split */
105 dxtrace(printk(KERN_DEBUG "using %u of %u node entries\n",
106 dx_get_count(entries), dx_get_limit(entries)));
108 + if (frame - frames + 1 >= ext4_dir_htree_level(sb) ||
109 + EXT4_SB(sb)->s_warning_dir_size)
110 + ret_warn = dir_size_in_warning_range(frames, frame, dir);
112 /* Need to split index? */
113 if (dx_get_count(entries) == dx_get_limit(entries)) {
114 ext4_lblk_t newblock;
115 @@ -2548,7 +2610,7 @@ again:
116 dir->i_ino, current->comm, levels,
117 ext4_dir_htree_level(sb));
118 if (ext4_dir_htree_level(sb) < EXT4_HTREE_LEVEL) {
119 - ext4_warning(sb, "Large directory feature is"
120 + ext4_warning(sb, "Large directory feature is "
121 "not enabled on this "
124 @@ -2674,6 +2736,8 @@ cleanup:
125 * repeat dx_probe() to find out valid htree-path */
126 if (restart && err == 0)
128 + if (err == 0 && ret_warn)
133 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
134 index c625960..1914379 100644
135 --- a/fs/ext4/super.c
136 +++ b/fs/ext4/super.c
137 @@ -1546,6 +1546,8 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
138 sbi->s_li_wait_mult = arg;
139 } else if (token == Opt_max_dir_size_kb) {
140 sbi->s_max_dir_size_kb = arg;
141 + /* reset s_warning_dir_size and make it re-calculated */
142 + sbi->s_warning_dir_size = 0;
143 } else if (token == Opt_stripe) {
145 } else if (token == Opt_resuid) {
146 diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
147 index c625960..1914379 100644
148 --- a/fs/ext4/sysfs.c
149 +++ b/fs/ext4/sysfs.c
150 @@ -2657,6 +2659,7 @@ EXT4_ATTR_OFFSET(inode_readahead_blks, 0644, sbi_ui_show,
151 EXT4_RW_ATTR_SBI_UI(inode_goal, s_inode_goal);
152 EXT4_RW_ATTR_SBI_UI(max_dir_size, s_max_dir_size_kb);
153 EXT4_RW_ATTR_SBI_UI(max_dir_size_kb, s_max_dir_size_kb);
154 +EXT4_RW_ATTR_SBI_UI(warning_dir_size, s_warning_dir_size);
155 EXT4_RW_ATTR_SBI_UI(mb_stats, s_mb_stats);
156 EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan);
157 EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan);
158 @@ -2686,6 +2689,7 @@ static struct attribute *ext4_attrs[] = {
159 ATTR_LIST(inode_goal),
160 ATTR_LIST(max_dir_size),
161 ATTR_LIST(max_dir_size_kb),
162 + ATTR_LIST(warning_dir_size),
164 ATTR_LIST(mb_max_to_scan),
165 ATTR_LIST(mb_min_to_scan),