1 Index: linux-2.6.12/fs/ext3/namei.c
2 ===================================================================
3 --- linux-2.6.12.orig/fs/ext3/namei.c
4 +++ linux-2.6.12/fs/ext3/namei.c
5 @@ -1600,11 +1600,17 @@ static int ext3_delete_entry (handle_t *
6 static inline void ext3_inc_count(handle_t *handle, struct inode *inode)
9 + if (is_dx(inode) && inode->i_nlink > 1) {
10 + /* limit is 16-bit i_links_count */
11 + if (inode->i_nlink >= EXT3_LINK_MAX || inode->i_nlink == 2)
16 static inline void ext3_dec_count(handle_t *handle, struct inode *inode)
19 + if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2)
23 static int ext3_add_nondir(handle_t *handle,
24 @@ -1703,7 +1709,7 @@ static int ext3_mkdir(struct inode * dir
25 struct ext3_dir_entry_2 * de;
28 - if (dir->i_nlink >= EXT3_LINK_MAX)
29 + if (EXT3_DIR_LINK_MAX(dir))
33 @@ -1782,7 +1793,7 @@ retry:
34 inode->i_size = EXT3_I(inode)->i_disksize = inode->i_sb->s_blocksize;
35 dir_block = ext3_bread (handle, inode, 0, 1, &err);
37 - inode->i_nlink--; /* is this nlink == 0? */
38 + drop_nlink(inode); /* is this nlink == 0? */
39 ext3_mark_inode_dirty(handle, inode);
42 @@ -1758,7 +1764,7 @@ retry:
47 + ext3_inc_count(handle, dir);
48 ext3_update_dx_flag(dir);
49 ext3_mark_inode_dirty(handle, dir);
50 d_instantiate(dentry, inode);
51 @@ -2023,10 +2029,10 @@ static int ext3_rmdir (struct inode * di
52 retval = ext3_delete_entry(handle, dir, de, bh);
55 - if (inode->i_nlink != 2)
56 - ext3_warning (inode->i_sb, "ext3_rmdir",
57 - "empty directory has nlink!=2 (%d)",
59 + if (!EXT3_DIR_LINK_EMPTY(inode))
60 + ext3_warning(inode->i_sb, "ext3_rmdir",
61 + "empty directory has too many links (%d)",
65 /* There's no need to set i_disksize: the fact that i_nlink is
66 @@ -2036,7 +2042,7 @@ static int ext3_rmdir (struct inode * di
67 ext3_orphan_add(handle, inode);
68 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
69 ext3_mark_inode_dirty(handle, inode);
71 + ext3_dec_count(handle, dir);
72 ext3_update_dx_flag(dir);
73 ext3_mark_inode_dirty(handle, dir);
75 @@ -2087,7 +2093,7 @@ static int ext3_unlink(struct inode * di
76 dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
77 ext3_update_dx_flag(dir);
78 ext3_mark_inode_dirty(handle, dir);
80 + ext3_dec_count(handle, inode);
82 ext3_orphan_add(handle, inode);
83 inode->i_ctime = dir->i_ctime;
84 @@ -2162,7 +2168,7 @@ static int ext3_link (struct dentry * ol
85 struct inode *inode = old_dentry->d_inode;
88 - if (inode->i_nlink >= EXT3_LINK_MAX)
89 + if (EXT3_DIR_LINK_MAX(inode))
93 @@ -2249,8 +2255,8 @@ static int ext3_rename (struct inode * o
94 if (le32_to_cpu(PARENT_INO(dir_bh->b_data)) != old_dir->i_ino)
97 - if (!new_inode && new_dir!=old_dir &&
98 - new_dir->i_nlink >= EXT3_LINK_MAX)
99 + if (!new_inode && new_dir != old_dir &&
100 + EXT3_DIR_LINK_MAX(new_dir))
104 @@ -2307,7 +2313,7 @@ static int ext3_rename (struct inode * o
108 - new_inode->i_nlink--;
109 + ext3_dec_count(handle, new_inode);
110 new_inode->i_ctime = CURRENT_TIME_SEC;
112 old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC;
113 @@ -2318,11 +2324,13 @@ static int ext3_rename (struct inode * o
114 PARENT_INO(dir_bh->b_data) = cpu_to_le32(new_dir->i_ino);
115 BUFFER_TRACE(dir_bh, "call ext3_journal_dirty_metadata");
116 ext3_journal_dirty_metadata(handle, dir_bh);
117 - old_dir->i_nlink--;
118 + ext3_dec_count(handle, old_dir);
120 - new_inode->i_nlink--;
121 + /* checked empty_dir above, can't have another parent,
122 + * ext3_dec_count() won't work for many-linked dirs */
123 + new_inode->i_nlink = 0;
125 - new_dir->i_nlink++;
126 + ext3_inc_count(handle, new_dir);
127 ext3_update_dx_flag(new_dir);
128 ext3_mark_inode_dirty(handle, new_dir);
130 Index: linux-2.6.12/include/linux/ext3_fs.h
131 ===================================================================
132 --- linux-2.6.12.orig/include/linux/ext3_fs.h
133 +++ linux-2.6.12/include/linux/ext3_fs.h
134 @@ -78,7 +78,7 @@ struct statfs;
136 * Maximal count of links to a file
138 -#define EXT3_LINK_MAX 32000
139 +#define EXT3_LINK_MAX 65000
142 * Macro-instructions used to manage several block sizes
143 @@ -539,6 +539,7 @@ static inline struct ext3_inode_info *EX
144 #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
145 #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
146 #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
147 +#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
149 #define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
150 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
151 @@ -552,6 +553,7 @@ static inline struct ext3_inode_info *EX
152 EXT3_FEATURE_INCOMPAT_META_BG)
153 #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
154 EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
155 + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
156 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)