Diff markup
1 /* 1 /*
2 * linux/fs/ext3/namei.c 2 * linux/fs/ext3/namei.c
3 * 3 *
4 * Copyright (C) 1992, 1993, 1994, 1995 4 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr) 5 * Remy Card (card@masi.ibp.fr)
6 * Laboratoire MASI - Institut Blaise Pascal 6 * Laboratoire MASI - Institut Blaise Pascal
7 * Universite Pierre et Marie Curie (Paris VI) 7 * Universite Pierre et Marie Curie (Paris VI)
8 * 8 *
9 * from 9 * from
10 * 10 *
11 * linux/fs/minix/namei.c 11 * linux/fs/minix/namei.c
12 * 12 *
13 * Copyright (C) 1991, 1992 Linus Torvalds 13 * Copyright (C) 1991, 1992 Linus Torvalds
14 * 14 *
15 * Big-endian to little-endian byte-swapping/ 15 * Big-endian to little-endian byte-swapping/bitmaps by
16 * David S. Miller (davem@caip.rutgers. 16 * David S. Miller (davem@caip.rutgers.edu), 1995
17 * Directory entry file type support and forw 17 * Directory entry file type support and forward compatibility hooks
18 * for B-tree directories by Theodore Ts' 18 * for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998
19 * Hash Tree Directory indexing (c) 19 * Hash Tree Directory indexing (c)
20 * Daniel Phillips, 2001 20 * Daniel Phillips, 2001
21 * Hash Tree Directory indexing porting 21 * Hash Tree Directory indexing porting
22 * Christopher Li, 2002 22 * Christopher Li, 2002
23 * Hash Tree Directory indexing cleanup 23 * Hash Tree Directory indexing cleanup
24 * Theodore Ts'o, 2002 24 * Theodore Ts'o, 2002
25 */ 25 */
26 26
27 #include <linux/fs.h> 27 #include <linux/fs.h>
28 #include <linux/pagemap.h> 28 #include <linux/pagemap.h>
29 #include <linux/jbd.h> 29 #include <linux/jbd.h>
30 #include <linux/time.h> 30 #include <linux/time.h>
31 #include <linux/ext3_fs.h> 31 #include <linux/ext3_fs.h>
32 #include <linux/ext3_jbd.h> 32 #include <linux/ext3_jbd.h>
33 #include <linux/fcntl.h> 33 #include <linux/fcntl.h>
34 #include <linux/stat.h> 34 #include <linux/stat.h>
35 #include <linux/string.h> 35 #include <linux/string.h>
36 #include <linux/quotaops.h> 36 #include <linux/quotaops.h>
37 #include <linux/buffer_head.h> 37 #include <linux/buffer_head.h>
38 #include <linux/bio.h> 38 #include <linux/bio.h>
39 39
40 #include "namei.h" 40 #include "namei.h"
41 #include "xattr.h" 41 #include "xattr.h"
42 #include "acl.h" 42 #include "acl.h"
43 43
44 /* 44 /*
45 * define how far ahead to read directories wh 45 * define how far ahead to read directories while searching them.
46 */ 46 */
47 #define NAMEI_RA_CHUNKS 2 47 #define NAMEI_RA_CHUNKS 2
48 #define NAMEI_RA_BLOCKS 4 48 #define NAMEI_RA_BLOCKS 4
49 #define NAMEI_RA_SIZE (NAMEI_RA_CHUNKS 49 #define NAMEI_RA_SIZE (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
50 #define NAMEI_RA_INDEX(c,b) (((c) * NAMEI_RA_ 50 #define NAMEI_RA_INDEX(c,b) (((c) * NAMEI_RA_BLOCKS) + (b))
51 51
52 static struct buffer_head *ext3_append(handle_ 52 static struct buffer_head *ext3_append(handle_t *handle,
53 struct 53 struct inode *inode,
54 u32 *b 54 u32 *block, int *err)
55 { 55 {
56 struct buffer_head *bh; 56 struct buffer_head *bh;
57 57
58 *block = inode->i_size >> inode->i_sb- 58 *block = inode->i_size >> inode->i_sb->s_blocksize_bits;
59 59
60 if ((bh = ext3_bread(handle, inode, *b !! 60 bh = ext3_bread(handle, inode, *block, 1, err);
>> 61 if (bh) {
61 inode->i_size += inode->i_sb-> 62 inode->i_size += inode->i_sb->s_blocksize;
62 EXT3_I(inode)->i_disksize = in 63 EXT3_I(inode)->i_disksize = inode->i_size;
63 ext3_journal_get_write_access( !! 64 *err = ext3_journal_get_write_access(handle, bh);
>> 65 if (*err) {
>> 66 brelse(bh);
>> 67 bh = NULL;
>> 68 }
64 } 69 }
65 return bh; 70 return bh;
66 } 71 }
67 72
68 #ifndef assert 73 #ifndef assert
69 #define assert(test) J_ASSERT(test) 74 #define assert(test) J_ASSERT(test)
70 #endif 75 #endif
71 76
72 #ifndef swap <<
73 #define swap(x, y) do { typeof(x) z = x; x = y <<
74 #endif <<
75 <<
76 #ifdef DX_DEBUG 77 #ifdef DX_DEBUG
77 #define dxtrace(command) command 78 #define dxtrace(command) command
78 #else 79 #else
79 #define dxtrace(command) 80 #define dxtrace(command)
80 #endif 81 #endif
81 82
82 struct fake_dirent 83 struct fake_dirent
83 { 84 {
84 __le32 inode; 85 __le32 inode;
85 __le16 rec_len; 86 __le16 rec_len;
86 u8 name_len; 87 u8 name_len;
87 u8 file_type; 88 u8 file_type;
88 }; 89 };
89 90
90 struct dx_countlimit 91 struct dx_countlimit
91 { 92 {
92 __le16 limit; 93 __le16 limit;
93 __le16 count; 94 __le16 count;
94 }; 95 };
95 96
96 struct dx_entry 97 struct dx_entry
97 { 98 {
98 __le32 hash; 99 __le32 hash;
99 __le32 block; 100 __le32 block;
100 }; 101 };
101 102
102 /* 103 /*
103 * dx_root_info is laid out so that if it shou 104 * dx_root_info is laid out so that if it should somehow get overlaid by a
104 * dirent the two low bits of the hash version 105 * dirent the two low bits of the hash version will be zero. Therefore, the
105 * hash version mod 4 should never be 0. Sinc 106 * hash version mod 4 should never be 0. Sincerely, the paranoia department.
106 */ 107 */
107 108
108 struct dx_root 109 struct dx_root
109 { 110 {
110 struct fake_dirent dot; 111 struct fake_dirent dot;
111 char dot_name[4]; 112 char dot_name[4];
112 struct fake_dirent dotdot; 113 struct fake_dirent dotdot;
113 char dotdot_name[4]; 114 char dotdot_name[4];
114 struct dx_root_info 115 struct dx_root_info
115 { 116 {
116 __le32 reserved_zero; 117 __le32 reserved_zero;
117 u8 hash_version; 118 u8 hash_version;
118 u8 info_length; /* 8 */ 119 u8 info_length; /* 8 */
119 u8 indirect_levels; 120 u8 indirect_levels;
120 u8 unused_flags; 121 u8 unused_flags;
121 } 122 }
122 info; 123 info;
123 struct dx_entry entries[0]; 124 struct dx_entry entries[0];
124 }; 125 };
125 126
126 struct dx_node 127 struct dx_node
127 { 128 {
128 struct fake_dirent fake; 129 struct fake_dirent fake;
129 struct dx_entry entries[0]; 130 struct dx_entry entries[0];
130 }; 131 };
131 132
132 133
133 struct dx_frame 134 struct dx_frame
134 { 135 {
135 struct buffer_head *bh; 136 struct buffer_head *bh;
136 struct dx_entry *entries; 137 struct dx_entry *entries;
137 struct dx_entry *at; 138 struct dx_entry *at;
138 }; 139 };
139 140
140 struct dx_map_entry 141 struct dx_map_entry
141 { 142 {
142 u32 hash; 143 u32 hash;
143 u16 offs; 144 u16 offs;
144 u16 size; 145 u16 size;
145 }; 146 };
146 147
147 static inline unsigned dx_get_block (struct dx 148 static inline unsigned dx_get_block (struct dx_entry *entry);
148 static void dx_set_block (struct dx_entry *ent 149 static void dx_set_block (struct dx_entry *entry, unsigned value);
149 static inline unsigned dx_get_hash (struct dx_ 150 static inline unsigned dx_get_hash (struct dx_entry *entry);
150 static void dx_set_hash (struct dx_entry *entr 151 static void dx_set_hash (struct dx_entry *entry, unsigned value);
151 static unsigned dx_get_count (struct dx_entry 152 static unsigned dx_get_count (struct dx_entry *entries);
152 static unsigned dx_get_limit (struct dx_entry 153 static unsigned dx_get_limit (struct dx_entry *entries);
153 static void dx_set_count (struct dx_entry *ent 154 static void dx_set_count (struct dx_entry *entries, unsigned value);
154 static void dx_set_limit (struct dx_entry *ent 155 static void dx_set_limit (struct dx_entry *entries, unsigned value);
155 static unsigned dx_root_limit (struct inode *d 156 static unsigned dx_root_limit (struct inode *dir, unsigned infosize);
156 static unsigned dx_node_limit (struct inode *d 157 static unsigned dx_node_limit (struct inode *dir);
157 static struct dx_frame *dx_probe(struct dentry !! 158 static struct dx_frame *dx_probe(struct qstr *entry,
158 struct inode 159 struct inode *dir,
159 struct dx_has 160 struct dx_hash_info *hinfo,
160 struct dx_fra 161 struct dx_frame *frame,
161 int *err); 162 int *err);
162 static void dx_release (struct dx_frame *frame 163 static void dx_release (struct dx_frame *frames);
163 static int dx_make_map (struct ext3_dir_entry_ !! 164 static int dx_make_map(struct ext3_dir_entry_2 *de, unsigned blocksize,
164 struct dx_hash_info *h 165 struct dx_hash_info *hinfo, struct dx_map_entry map[]);
165 static void dx_sort_map(struct dx_map_entry *m 166 static void dx_sort_map(struct dx_map_entry *map, unsigned count);
166 static struct ext3_dir_entry_2 *dx_move_dirent 167 static struct ext3_dir_entry_2 *dx_move_dirents (char *from, char *to,
167 struct dx_map_entry *offsets, 168 struct dx_map_entry *offsets, int count);
168 static struct ext3_dir_entry_2* dx_pack_dirent !! 169 static struct ext3_dir_entry_2 *dx_pack_dirents(char *base, unsigned blocksize);
169 static void dx_insert_block (struct dx_frame * 170 static void dx_insert_block (struct dx_frame *frame, u32 hash, u32 block);
170 static int ext3_htree_next_block(struct inode 171 static int ext3_htree_next_block(struct inode *dir, __u32 hash,
171 struct dx_fra 172 struct dx_frame *frame,
172 struct dx_fra 173 struct dx_frame *frames,
173 __u32 *start_ 174 __u32 *start_hash);
174 static struct buffer_head * ext3_dx_find_entry !! 175 static struct buffer_head * ext3_dx_find_entry(struct inode *dir,
175 struct ext3_dir_entry_2 !! 176 struct qstr *entry, struct ext3_dir_entry_2 **res_dir,
>> 177 int *err);
176 static int ext3_dx_add_entry(handle_t *handle, 178 static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
177 struct inode *ino 179 struct inode *inode);
178 180
179 /* 181 /*
180 * p is at least 6 bytes before the end of pag 182 * p is at least 6 bytes before the end of page
181 */ 183 */
182 static inline struct ext3_dir_entry_2 * 184 static inline struct ext3_dir_entry_2 *
183 ext3_next_entry(struct ext3_dir_entry_2 *p) 185 ext3_next_entry(struct ext3_dir_entry_2 *p)
184 { 186 {
185 return (struct ext3_dir_entry_2 *)((ch 187 return (struct ext3_dir_entry_2 *)((char *)p +
186 ext3_rec_len_from_disk(p->rec_ 188 ext3_rec_len_from_disk(p->rec_len));
187 } 189 }
188 190
189 /* 191 /*
190 * Future: use high four bits of block for coa 192 * Future: use high four bits of block for coalesce-on-delete flags
191 * Mask them off for now. 193 * Mask them off for now.
192 */ 194 */
193 195
194 static inline unsigned dx_get_block (struct dx 196 static inline unsigned dx_get_block (struct dx_entry *entry)
195 { 197 {
196 return le32_to_cpu(entry->block) & 0x0 198 return le32_to_cpu(entry->block) & 0x00ffffff;
197 } 199 }
198 200
199 static inline void dx_set_block (struct dx_ent 201 static inline void dx_set_block (struct dx_entry *entry, unsigned value)
200 { 202 {
201 entry->block = cpu_to_le32(value); 203 entry->block = cpu_to_le32(value);
202 } 204 }
203 205
204 static inline unsigned dx_get_hash (struct dx_ 206 static inline unsigned dx_get_hash (struct dx_entry *entry)
205 { 207 {
206 return le32_to_cpu(entry->hash); 208 return le32_to_cpu(entry->hash);
207 } 209 }
208 210
209 static inline void dx_set_hash (struct dx_entr 211 static inline void dx_set_hash (struct dx_entry *entry, unsigned value)
210 { 212 {
211 entry->hash = cpu_to_le32(value); 213 entry->hash = cpu_to_le32(value);
212 } 214 }
213 215
214 static inline unsigned dx_get_count (struct dx 216 static inline unsigned dx_get_count (struct dx_entry *entries)
215 { 217 {
216 return le16_to_cpu(((struct dx_countli 218 return le16_to_cpu(((struct dx_countlimit *) entries)->count);
217 } 219 }
218 220
219 static inline unsigned dx_get_limit (struct dx 221 static inline unsigned dx_get_limit (struct dx_entry *entries)
220 { 222 {
221 return le16_to_cpu(((struct dx_countli 223 return le16_to_cpu(((struct dx_countlimit *) entries)->limit);
222 } 224 }
223 225
224 static inline void dx_set_count (struct dx_ent 226 static inline void dx_set_count (struct dx_entry *entries, unsigned value)
225 { 227 {
226 ((struct dx_countlimit *) entries)->co 228 ((struct dx_countlimit *) entries)->count = cpu_to_le16(value);
227 } 229 }
228 230
229 static inline void dx_set_limit (struct dx_ent 231 static inline void dx_set_limit (struct dx_entry *entries, unsigned value)
230 { 232 {
231 ((struct dx_countlimit *) entries)->li 233 ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
232 } 234 }
233 235
234 static inline unsigned dx_root_limit (struct i 236 static inline unsigned dx_root_limit (struct inode *dir, unsigned infosize)
235 { 237 {
236 unsigned entry_space = dir->i_sb->s_bl 238 unsigned entry_space = dir->i_sb->s_blocksize - EXT3_DIR_REC_LEN(1) -
237 EXT3_DIR_REC_LEN(2) - infosize 239 EXT3_DIR_REC_LEN(2) - infosize;
238 return 0? 20: entry_space / sizeof(str !! 240 return entry_space / sizeof(struct dx_entry);
239 } 241 }
240 242
241 static inline unsigned dx_node_limit (struct i 243 static inline unsigned dx_node_limit (struct inode *dir)
242 { 244 {
243 unsigned entry_space = dir->i_sb->s_bl 245 unsigned entry_space = dir->i_sb->s_blocksize - EXT3_DIR_REC_LEN(0);
244 return 0? 22: entry_space / sizeof(str !! 246 return entry_space / sizeof(struct dx_entry);
245 } 247 }
246 248
247 /* 249 /*
248 * Debug 250 * Debug
249 */ 251 */
250 #ifdef DX_DEBUG 252 #ifdef DX_DEBUG
251 static void dx_show_index (char * label, struc 253 static void dx_show_index (char * label, struct dx_entry *entries)
252 { 254 {
253 int i, n = dx_get_count (entries); 255 int i, n = dx_get_count (entries);
254 printk("%s index ", label); 256 printk("%s index ", label);
255 for (i = 0; i < n; i++) 257 for (i = 0; i < n; i++)
256 { 258 {
257 printk("%x->%u ", i? dx_get_ha 259 printk("%x->%u ", i? dx_get_hash(entries + i): 0, dx_get_block(entries + i));
258 } 260 }
259 printk("\n"); 261 printk("\n");
260 } 262 }
261 263
262 struct stats 264 struct stats
263 { 265 {
264 unsigned names; 266 unsigned names;
265 unsigned space; 267 unsigned space;
266 unsigned bcount; 268 unsigned bcount;
267 }; 269 };
268 270
269 static struct stats dx_show_leaf(struct dx_has 271 static struct stats dx_show_leaf(struct dx_hash_info *hinfo, struct ext3_dir_entry_2 *de,
270 int size, int 272 int size, int show_names)
271 { 273 {
272 unsigned names = 0, space = 0; 274 unsigned names = 0, space = 0;
273 char *base = (char *) de; 275 char *base = (char *) de;
274 struct dx_hash_info h = *hinfo; 276 struct dx_hash_info h = *hinfo;
275 277
276 printk("names: "); 278 printk("names: ");
277 while ((char *) de < base + size) 279 while ((char *) de < base + size)
278 { 280 {
279 if (de->inode) 281 if (de->inode)
280 { 282 {
281 if (show_names) 283 if (show_names)
282 { 284 {
283 int len = de-> 285 int len = de->name_len;
284 char *name = d 286 char *name = de->name;
285 while (len--) 287 while (len--) printk("%c", *name++);
286 ext3fs_dirhash 288 ext3fs_dirhash(de->name, de->name_len, &h);
287 printk(":%x.%u 289 printk(":%x.%u ", h.hash,
288 ((char 290 ((char *) de - base));
289 } 291 }
290 space += EXT3_DIR_REC_ 292 space += EXT3_DIR_REC_LEN(de->name_len);
291 names++; 293 names++;
292 } 294 }
293 de = ext3_next_entry(de); 295 de = ext3_next_entry(de);
294 } 296 }
295 printk("(%i)\n", names); 297 printk("(%i)\n", names);
296 return (struct stats) { names, space, 298 return (struct stats) { names, space, 1 };
297 } 299 }
298 300
299 struct stats dx_show_entries(struct dx_hash_in 301 struct stats dx_show_entries(struct dx_hash_info *hinfo, struct inode *dir,
300 struct dx_entry * 302 struct dx_entry *entries, int levels)
301 { 303 {
302 unsigned blocksize = dir->i_sb->s_bloc 304 unsigned blocksize = dir->i_sb->s_blocksize;
303 unsigned count = dx_get_count (entries 305 unsigned count = dx_get_count (entries), names = 0, space = 0, i;
304 unsigned bcount = 0; 306 unsigned bcount = 0;
305 struct buffer_head *bh; 307 struct buffer_head *bh;
306 int err; 308 int err;
307 printk("%i indexed blocks...\n", count 309 printk("%i indexed blocks...\n", count);
308 for (i = 0; i < count; i++, entries++) 310 for (i = 0; i < count; i++, entries++)
309 { 311 {
310 u32 block = dx_get_block(entri 312 u32 block = dx_get_block(entries), hash = i? dx_get_hash(entries): 0;
311 u32 range = i < count - 1? (dx 313 u32 range = i < count - 1? (dx_get_hash(entries + 1) - hash): ~hash;
312 struct stats stats; 314 struct stats stats;
313 printk("%s%3u:%03u hash %8x/%8 315 printk("%s%3u:%03u hash %8x/%8x ",levels?"":" ", i, block, hash, range);
314 if (!(bh = ext3_bread (NULL,di 316 if (!(bh = ext3_bread (NULL,dir, block, 0,&err))) continue;
315 stats = levels? 317 stats = levels?
316 dx_show_entries(hinfo, dir, 318 dx_show_entries(hinfo, dir, ((struct dx_node *) bh->b_data)->entries, levels - 1):
317 dx_show_leaf(hinfo, (struct 319 dx_show_leaf(hinfo, (struct ext3_dir_entry_2 *) bh->b_data, blocksize, 0);
318 names += stats.names; 320 names += stats.names;
319 space += stats.space; 321 space += stats.space;
320 bcount += stats.bcount; 322 bcount += stats.bcount;
321 brelse (bh); 323 brelse (bh);
322 } 324 }
323 if (bcount) 325 if (bcount)
324 printk("%snames %u, fullness % 326 printk("%snames %u, fullness %u (%u%%)\n", levels?"":" ",
325 names, space/bcount,(s 327 names, space/bcount,(space/bcount)*100/blocksize);
326 return (struct stats) { names, space, 328 return (struct stats) { names, space, bcount};
327 } 329 }
328 #endif /* DX_DEBUG */ 330 #endif /* DX_DEBUG */
329 331
330 /* 332 /*
331 * Probe for a directory leaf block to search. 333 * Probe for a directory leaf block to search.
332 * 334 *
333 * dx_probe can return ERR_BAD_DX_DIR, which m 335 * dx_probe can return ERR_BAD_DX_DIR, which means there was a format
334 * error in the directory index, and the calle 336 * error in the directory index, and the caller should fall back to
335 * searching the directory normally. The call 337 * searching the directory normally. The callers of dx_probe **MUST**
336 * check for this error code, and make sure it 338 * check for this error code, and make sure it never gets reflected
337 * back to userspace. 339 * back to userspace.
338 */ 340 */
339 static struct dx_frame * 341 static struct dx_frame *
340 dx_probe(struct dentry *dentry, struct inode * !! 342 dx_probe(struct qstr *entry, struct inode *dir,
341 struct dx_hash_info *hinfo, struct dx 343 struct dx_hash_info *hinfo, struct dx_frame *frame_in, int *err)
342 { 344 {
343 unsigned count, indirect; 345 unsigned count, indirect;
344 struct dx_entry *at, *entries, *p, *q, 346 struct dx_entry *at, *entries, *p, *q, *m;
345 struct dx_root *root; 347 struct dx_root *root;
346 struct buffer_head *bh; 348 struct buffer_head *bh;
347 struct dx_frame *frame = frame_in; 349 struct dx_frame *frame = frame_in;
348 u32 hash; 350 u32 hash;
349 351
350 frame->bh = NULL; 352 frame->bh = NULL;
351 if (dentry) <<
352 dir = dentry->d_parent->d_inod <<
353 if (!(bh = ext3_bread (NULL,dir, 0, 0, 353 if (!(bh = ext3_bread (NULL,dir, 0, 0, err)))
354 goto fail; 354 goto fail;
355 root = (struct dx_root *) bh->b_data; 355 root = (struct dx_root *) bh->b_data;
356 if (root->info.hash_version != DX_HASH 356 if (root->info.hash_version != DX_HASH_TEA &&
357 root->info.hash_version != DX_HASH 357 root->info.hash_version != DX_HASH_HALF_MD4 &&
358 root->info.hash_version != DX_HASH 358 root->info.hash_version != DX_HASH_LEGACY) {
359 ext3_warning(dir->i_sb, __FUNC !! 359 ext3_warning(dir->i_sb, __func__,
360 "Unrecognised ino 360 "Unrecognised inode hash code %d",
361 root->info.hash_v 361 root->info.hash_version);
362 brelse(bh); 362 brelse(bh);
363 *err = ERR_BAD_DX_DIR; 363 *err = ERR_BAD_DX_DIR;
364 goto fail; 364 goto fail;
365 } 365 }
366 hinfo->hash_version = root->info.hash_ 366 hinfo->hash_version = root->info.hash_version;
>> 367 if (hinfo->hash_version <= DX_HASH_TEA)
>> 368 hinfo->hash_version += EXT3_SB(dir->i_sb)->s_hash_unsigned;
367 hinfo->seed = EXT3_SB(dir->i_sb)->s_ha 369 hinfo->seed = EXT3_SB(dir->i_sb)->s_hash_seed;
368 if (dentry) !! 370 if (entry)
369 ext3fs_dirhash(dentry->d_name. !! 371 ext3fs_dirhash(entry->name, entry->len, hinfo);
370 hash = hinfo->hash; 372 hash = hinfo->hash;
371 373
372 if (root->info.unused_flags & 1) { 374 if (root->info.unused_flags & 1) {
373 ext3_warning(dir->i_sb, __FUNC !! 375 ext3_warning(dir->i_sb, __func__,
374 "Unimplemented in 376 "Unimplemented inode hash flags: %#06x",
375 root->info.unused 377 root->info.unused_flags);
376 brelse(bh); 378 brelse(bh);
377 *err = ERR_BAD_DX_DIR; 379 *err = ERR_BAD_DX_DIR;
378 goto fail; 380 goto fail;
379 } 381 }
380 382
381 if ((indirect = root->info.indirect_le 383 if ((indirect = root->info.indirect_levels) > 1) {
382 ext3_warning(dir->i_sb, __FUNC !! 384 ext3_warning(dir->i_sb, __func__,
383 "Unimplemented in 385 "Unimplemented inode hash depth: %#06x",
384 root->info.indire 386 root->info.indirect_levels);
385 brelse(bh); 387 brelse(bh);
386 *err = ERR_BAD_DX_DIR; 388 *err = ERR_BAD_DX_DIR;
387 goto fail; 389 goto fail;
388 } 390 }
389 391
390 entries = (struct dx_entry *) (((char 392 entries = (struct dx_entry *) (((char *)&root->info) +
391 root->i 393 root->info.info_length);
392 394
393 if (dx_get_limit(entries) != dx_root_l 395 if (dx_get_limit(entries) != dx_root_limit(dir,
394 396 root->info.info_length)) {
395 ext3_warning(dir->i_sb, __FUNC !! 397 ext3_warning(dir->i_sb, __func__,
396 "dx entry: limit 398 "dx entry: limit != root limit");
397 brelse(bh); 399 brelse(bh);
398 *err = ERR_BAD_DX_DIR; 400 *err = ERR_BAD_DX_DIR;
399 goto fail; 401 goto fail;
400 } 402 }
401 403
402 dxtrace (printk("Look up %x", hash)); 404 dxtrace (printk("Look up %x", hash));
403 while (1) 405 while (1)
404 { 406 {
405 count = dx_get_count(entries); 407 count = dx_get_count(entries);
406 if (!count || count > dx_get_l 408 if (!count || count > dx_get_limit(entries)) {
407 ext3_warning(dir->i_sb !! 409 ext3_warning(dir->i_sb, __func__,
408 "dx entry 410 "dx entry: no count or count > limit");
409 brelse(bh); 411 brelse(bh);
410 *err = ERR_BAD_DX_DIR; 412 *err = ERR_BAD_DX_DIR;
411 goto fail2; 413 goto fail2;
412 } 414 }
413 415
414 p = entries + 1; 416 p = entries + 1;
415 q = entries + count - 1; 417 q = entries + count - 1;
416 while (p <= q) 418 while (p <= q)
417 { 419 {
418 m = p + (q - p)/2; 420 m = p + (q - p)/2;
419 dxtrace(printk(".")); 421 dxtrace(printk("."));
420 if (dx_get_hash(m) > h 422 if (dx_get_hash(m) > hash)
421 q = m - 1; 423 q = m - 1;
422 else 424 else
423 p = m + 1; 425 p = m + 1;
424 } 426 }
425 427
426 if (0) // linear search cross 428 if (0) // linear search cross check
427 { 429 {
428 unsigned n = count - 1 430 unsigned n = count - 1;
429 at = entries; 431 at = entries;
430 while (n--) 432 while (n--)
431 { 433 {
432 dxtrace(printk 434 dxtrace(printk(","));
433 if (dx_get_has 435 if (dx_get_hash(++at) > hash)
434 { 436 {
435 at--; 437 at--;
436 break; 438 break;
437 } 439 }
438 } 440 }
439 assert (at == p - 1); 441 assert (at == p - 1);
440 } 442 }
441 443
442 at = p - 1; 444 at = p - 1;
443 dxtrace(printk(" %x->%u\n", at 445 dxtrace(printk(" %x->%u\n", at == entries? 0: dx_get_hash(at), dx_get_block(at)));
444 frame->bh = bh; 446 frame->bh = bh;
445 frame->entries = entries; 447 frame->entries = entries;
446 frame->at = at; 448 frame->at = at;
447 if (!indirect--) return frame; 449 if (!indirect--) return frame;
448 if (!(bh = ext3_bread (NULL,di 450 if (!(bh = ext3_bread (NULL,dir, dx_get_block(at), 0, err)))
449 goto fail2; 451 goto fail2;
450 at = entries = ((struct dx_nod 452 at = entries = ((struct dx_node *) bh->b_data)->entries;
451 if (dx_get_limit(entries) != d 453 if (dx_get_limit(entries) != dx_node_limit (dir)) {
452 ext3_warning(dir->i_sb !! 454 ext3_warning(dir->i_sb, __func__,
453 "dx entry 455 "dx entry: limit != node limit");
454 brelse(bh); 456 brelse(bh);
455 *err = ERR_BAD_DX_DIR; 457 *err = ERR_BAD_DX_DIR;
456 goto fail2; 458 goto fail2;
457 } 459 }
458 frame++; 460 frame++;
459 frame->bh = NULL; 461 frame->bh = NULL;
460 } 462 }
461 fail2: 463 fail2:
462 while (frame >= frame_in) { 464 while (frame >= frame_in) {
463 brelse(frame->bh); 465 brelse(frame->bh);
464 frame--; 466 frame--;
465 } 467 }
466 fail: 468 fail:
467 if (*err == ERR_BAD_DX_DIR) 469 if (*err == ERR_BAD_DX_DIR)
468 ext3_warning(dir->i_sb, __FUNC !! 470 ext3_warning(dir->i_sb, __func__,
469 "Corrupt dir inod 471 "Corrupt dir inode %ld, running e2fsck is "
470 "recommended.", d 472 "recommended.", dir->i_ino);
471 return NULL; 473 return NULL;
472 } 474 }
473 475
474 static void dx_release (struct dx_frame *frame 476 static void dx_release (struct dx_frame *frames)
475 { 477 {
476 if (frames[0].bh == NULL) 478 if (frames[0].bh == NULL)
477 return; 479 return;
478 480
479 if (((struct dx_root *) frames[0].bh-> 481 if (((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels)
480 brelse(frames[1].bh); 482 brelse(frames[1].bh);
481 brelse(frames[0].bh); 483 brelse(frames[0].bh);
482 } 484 }
483 485
484 /* 486 /*
485 * This function increments the frame pointer 487 * This function increments the frame pointer to search the next leaf
486 * block, and reads in the necessary interveni 488 * block, and reads in the necessary intervening nodes if the search
487 * should be necessary. Whether or not the se 489 * should be necessary. Whether or not the search is necessary is
488 * controlled by the hash parameter. If the h 490 * controlled by the hash parameter. If the hash value is even, then
489 * the search is only continued if the next bl 491 * the search is only continued if the next block starts with that
490 * hash value. This is used if we are searchi 492 * hash value. This is used if we are searching for a specific file.
491 * 493 *
492 * If the hash value is HASH_NB_ALWAYS, then a 494 * If the hash value is HASH_NB_ALWAYS, then always go to the next block.
493 * 495 *
494 * This function returns 1 if the caller shoul 496 * This function returns 1 if the caller should continue to search,
495 * or 0 if it should not. If there is an erro 497 * or 0 if it should not. If there is an error reading one of the
496 * index blocks, it will a negative error code 498 * index blocks, it will a negative error code.
497 * 499 *
498 * If start_hash is non-null, it will be fille 500 * If start_hash is non-null, it will be filled in with the starting
499 * hash of the next page. 501 * hash of the next page.
500 */ 502 */
501 static int ext3_htree_next_block(struct inode 503 static int ext3_htree_next_block(struct inode *dir, __u32 hash,
502 struct dx_fra 504 struct dx_frame *frame,
503 struct dx_fra 505 struct dx_frame *frames,
504 __u32 *start_ 506 __u32 *start_hash)
505 { 507 {
506 struct dx_frame *p; 508 struct dx_frame *p;
507 struct buffer_head *bh; 509 struct buffer_head *bh;
508 int err, num_frames = 0; 510 int err, num_frames = 0;
509 __u32 bhash; 511 __u32 bhash;
510 512
511 p = frame; 513 p = frame;
512 /* 514 /*
513 * Find the next leaf page by incremen 515 * Find the next leaf page by incrementing the frame pointer.
514 * If we run out of entries in the int 516 * If we run out of entries in the interior node, loop around and
515 * increment pointer in the parent nod 517 * increment pointer in the parent node. When we break out of
516 * this loop, num_frames indicates the 518 * this loop, num_frames indicates the number of interior
517 * nodes need to be read. 519 * nodes need to be read.
518 */ 520 */
519 while (1) { 521 while (1) {
520 if (++(p->at) < p->entries + d 522 if (++(p->at) < p->entries + dx_get_count(p->entries))
521 break; 523 break;
522 if (p == frames) 524 if (p == frames)
523 return 0; 525 return 0;
524 num_frames++; 526 num_frames++;
525 p--; 527 p--;
526 } 528 }
527 529
528 /* 530 /*
529 * If the hash is 1, then continue onl 531 * If the hash is 1, then continue only if the next page has a
530 * continuation hash of any value. Th 532 * continuation hash of any value. This is used for readdir
531 * handling. Otherwise, check to see 533 * handling. Otherwise, check to see if the hash matches the
532 * desired contiuation hash. If it do 534 * desired contiuation hash. If it doesn't, return since
533 * there's no point to read in the suc 535 * there's no point to read in the successive index pages.
534 */ 536 */
535 bhash = dx_get_hash(p->at); 537 bhash = dx_get_hash(p->at);
536 if (start_hash) 538 if (start_hash)
537 *start_hash = bhash; 539 *start_hash = bhash;
538 if ((hash & 1) == 0) { 540 if ((hash & 1) == 0) {
539 if ((bhash & ~1) != hash) 541 if ((bhash & ~1) != hash)
540 return 0; 542 return 0;
541 } 543 }
542 /* 544 /*
543 * If the hash is HASH_NB_ALWAYS, we a 545 * If the hash is HASH_NB_ALWAYS, we always go to the next
544 * block so no check is necessary 546 * block so no check is necessary
545 */ 547 */
546 while (num_frames--) { 548 while (num_frames--) {
547 if (!(bh = ext3_bread(NULL, di 549 if (!(bh = ext3_bread(NULL, dir, dx_get_block(p->at),
548 0, &err) 550 0, &err)))
549 return err; /* Failure 551 return err; /* Failure */
550 p++; 552 p++;
551 brelse (p->bh); 553 brelse (p->bh);
552 p->bh = bh; 554 p->bh = bh;
553 p->at = p->entries = ((struct 555 p->at = p->entries = ((struct dx_node *) bh->b_data)->entries;
554 } 556 }
555 return 1; 557 return 1;
556 } 558 }
557 559
558 560
559 /* 561 /*
560 * This function fills a red-black tree with i 562 * This function fills a red-black tree with information from a
561 * directory block. It returns the number dir 563 * directory block. It returns the number directory entries loaded
562 * into the tree. If there is an error it is 564 * into the tree. If there is an error it is returned in err.
563 */ 565 */
564 static int htree_dirblock_to_tree(struct file 566 static int htree_dirblock_to_tree(struct file *dir_file,
565 struct inode 567 struct inode *dir, int block,
566 struct dx_ha 568 struct dx_hash_info *hinfo,
567 __u32 start_ 569 __u32 start_hash, __u32 start_minor_hash)
568 { 570 {
569 struct buffer_head *bh; 571 struct buffer_head *bh;
570 struct ext3_dir_entry_2 *de, *top; 572 struct ext3_dir_entry_2 *de, *top;
571 int err, count = 0; 573 int err, count = 0;
572 574
573 dxtrace(printk("In htree dirblock_to_t 575 dxtrace(printk("In htree dirblock_to_tree: block %d\n", block));
574 if (!(bh = ext3_bread (NULL, dir, bloc 576 if (!(bh = ext3_bread (NULL, dir, block, 0, &err)))
575 return err; 577 return err;
576 578
577 de = (struct ext3_dir_entry_2 *) bh->b 579 de = (struct ext3_dir_entry_2 *) bh->b_data;
578 top = (struct ext3_dir_entry_2 *) ((ch 580 top = (struct ext3_dir_entry_2 *) ((char *) de +
579 dir 581 dir->i_sb->s_blocksize -
580 EXT 582 EXT3_DIR_REC_LEN(0));
581 for (; de < top; de = ext3_next_entry( 583 for (; de < top; de = ext3_next_entry(de)) {
582 if (!ext3_check_dir_entry("htr 584 if (!ext3_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,
583 (block 585 (block<<EXT3_BLOCK_SIZE_BITS(dir->i_sb))
584 586 +((char *)de - bh->b_data))) {
585 /* On error, skip the 587 /* On error, skip the f_pos to the next block. */
586 dir_file->f_pos = (dir 588 dir_file->f_pos = (dir_file->f_pos |
587 (dir-> 589 (dir->i_sb->s_blocksize - 1)) + 1;
588 brelse (bh); 590 brelse (bh);
589 return count; 591 return count;
590 } 592 }
591 ext3fs_dirhash(de->name, de->n 593 ext3fs_dirhash(de->name, de->name_len, hinfo);
592 if ((hinfo->hash < start_hash) 594 if ((hinfo->hash < start_hash) ||
593 ((hinfo->hash == start_has 595 ((hinfo->hash == start_hash) &&
594 (hinfo->minor_hash < star 596 (hinfo->minor_hash < start_minor_hash)))
595 continue; 597 continue;
596 if (de->inode == 0) 598 if (de->inode == 0)
597 continue; 599 continue;
598 if ((err = ext3_htree_store_di 600 if ((err = ext3_htree_store_dirent(dir_file,
599 hinfo->hash 601 hinfo->hash, hinfo->minor_hash, de)) != 0) {
600 brelse(bh); 602 brelse(bh);
601 return err; 603 return err;
602 } 604 }
603 count++; 605 count++;
604 } 606 }
605 brelse(bh); 607 brelse(bh);
606 return count; 608 return count;
607 } 609 }
608 610
609 611
610 /* 612 /*
611 * This function fills a red-black tree with i 613 * This function fills a red-black tree with information from a
612 * directory. We start scanning the directory 614 * directory. We start scanning the directory in hash order, starting
613 * at start_hash and start_minor_hash. 615 * at start_hash and start_minor_hash.
614 * 616 *
615 * This function returns the number of entries 617 * This function returns the number of entries inserted into the tree,
616 * or a negative error code. 618 * or a negative error code.
617 */ 619 */
618 int ext3_htree_fill_tree(struct file *dir_file 620 int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash,
619 __u32 start_minor_has 621 __u32 start_minor_hash, __u32 *next_hash)
620 { 622 {
621 struct dx_hash_info hinfo; 623 struct dx_hash_info hinfo;
622 struct ext3_dir_entry_2 *de; 624 struct ext3_dir_entry_2 *de;
623 struct dx_frame frames[2], *frame; 625 struct dx_frame frames[2], *frame;
624 struct inode *dir; 626 struct inode *dir;
625 int block, err; 627 int block, err;
626 int count = 0; 628 int count = 0;
627 int ret; 629 int ret;
628 __u32 hashval; 630 __u32 hashval;
629 631
630 dxtrace(printk("In htree_fill_tree, st 632 dxtrace(printk("In htree_fill_tree, start hash: %x:%x\n", start_hash,
631 start_minor_hash)); 633 start_minor_hash));
632 dir = dir_file->f_path.dentry->d_inode 634 dir = dir_file->f_path.dentry->d_inode;
633 if (!(EXT3_I(dir)->i_flags & EXT3_INDE 635 if (!(EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) {
634 hinfo.hash_version = EXT3_SB(d 636 hinfo.hash_version = EXT3_SB(dir->i_sb)->s_def_hash_version;
>> 637 if (hinfo.hash_version <= DX_HASH_TEA)
>> 638 hinfo.hash_version +=
>> 639 EXT3_SB(dir->i_sb)->s_hash_unsigned;
635 hinfo.seed = EXT3_SB(dir->i_sb 640 hinfo.seed = EXT3_SB(dir->i_sb)->s_hash_seed;
636 count = htree_dirblock_to_tree 641 count = htree_dirblock_to_tree(dir_file, dir, 0, &hinfo,
637 642 start_hash, start_minor_hash);
638 *next_hash = ~0; 643 *next_hash = ~0;
639 return count; 644 return count;
640 } 645 }
641 hinfo.hash = start_hash; 646 hinfo.hash = start_hash;
642 hinfo.minor_hash = 0; 647 hinfo.minor_hash = 0;
643 frame = dx_probe(NULL, dir_file->f_pat 648 frame = dx_probe(NULL, dir_file->f_path.dentry->d_inode, &hinfo, frames, &err);
644 if (!frame) 649 if (!frame)
645 return err; 650 return err;
646 651
647 /* Add '.' and '..' from the htree hea 652 /* Add '.' and '..' from the htree header */
648 if (!start_hash && !start_minor_hash) 653 if (!start_hash && !start_minor_hash) {
649 de = (struct ext3_dir_entry_2 654 de = (struct ext3_dir_entry_2 *) frames[0].bh->b_data;
650 if ((err = ext3_htree_store_di 655 if ((err = ext3_htree_store_dirent(dir_file, 0, 0, de)) != 0)
651 goto errout; 656 goto errout;
652 count++; 657 count++;
653 } 658 }
654 if (start_hash < 2 || (start_hash ==2 659 if (start_hash < 2 || (start_hash ==2 && start_minor_hash==0)) {
655 de = (struct ext3_dir_entry_2 660 de = (struct ext3_dir_entry_2 *) frames[0].bh->b_data;
656 de = ext3_next_entry(de); 661 de = ext3_next_entry(de);
657 if ((err = ext3_htree_store_di 662 if ((err = ext3_htree_store_dirent(dir_file, 2, 0, de)) != 0)
658 goto errout; 663 goto errout;
659 count++; 664 count++;
660 } 665 }
661 666
662 while (1) { 667 while (1) {
663 block = dx_get_block(frame->at 668 block = dx_get_block(frame->at);
664 ret = htree_dirblock_to_tree(d 669 ret = htree_dirblock_to_tree(dir_file, dir, block, &hinfo,
665 s 670 start_hash, start_minor_hash);
666 if (ret < 0) { 671 if (ret < 0) {
667 err = ret; 672 err = ret;
668 goto errout; 673 goto errout;
669 } 674 }
670 count += ret; 675 count += ret;
671 hashval = ~0; 676 hashval = ~0;
672 ret = ext3_htree_next_block(di 677 ret = ext3_htree_next_block(dir, HASH_NB_ALWAYS,
673 fr 678 frame, frames, &hashval);
674 *next_hash = hashval; 679 *next_hash = hashval;
675 if (ret < 0) { 680 if (ret < 0) {
676 err = ret; 681 err = ret;
677 goto errout; 682 goto errout;
678 } 683 }
679 /* 684 /*
680 * Stop if: (a) there are no 685 * Stop if: (a) there are no more entries, or
681 * (b) we have inserted at lea 686 * (b) we have inserted at least one entry and the
682 * next hash value is not a co 687 * next hash value is not a continuation
683 */ 688 */
684 if ((ret == 0) || 689 if ((ret == 0) ||
685 (count && ((hashval & 1) = 690 (count && ((hashval & 1) == 0)))
686 break; 691 break;
687 } 692 }
688 dx_release(frames); 693 dx_release(frames);
689 dxtrace(printk("Fill tree: returned %d 694 dxtrace(printk("Fill tree: returned %d entries, next hash: %x\n",
690 count, *next_hash)); 695 count, *next_hash));
691 return count; 696 return count;
692 errout: 697 errout:
693 dx_release(frames); 698 dx_release(frames);
694 return (err); 699 return (err);
695 } 700 }
696 701
697 702
698 /* 703 /*
699 * Directory block splitting, compacting 704 * Directory block splitting, compacting
700 */ 705 */
701 706
702 /* 707 /*
703 * Create map of hash values, offsets, and siz 708 * Create map of hash values, offsets, and sizes, stored at end of block.
704 * Returns number of entries mapped. 709 * Returns number of entries mapped.
705 */ 710 */
706 static int dx_make_map (struct ext3_dir_entry_ !! 711 static int dx_make_map(struct ext3_dir_entry_2 *de, unsigned blocksize,
707 struct dx_hash_info *h !! 712 struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
708 { 713 {
709 int count = 0; 714 int count = 0;
710 char *base = (char *) de; 715 char *base = (char *) de;
711 struct dx_hash_info h = *hinfo; 716 struct dx_hash_info h = *hinfo;
712 717
713 while ((char *) de < base + size) !! 718 while ((char *) de < base + blocksize)
714 { 719 {
715 if (de->name_len && de->inode) 720 if (de->name_len && de->inode) {
716 ext3fs_dirhash(de->nam 721 ext3fs_dirhash(de->name, de->name_len, &h);
717 map_tail--; 722 map_tail--;
718 map_tail->hash = h.has 723 map_tail->hash = h.hash;
719 map_tail->offs = (u16) 724 map_tail->offs = (u16) ((char *) de - base);
720 map_tail->size = le16_ 725 map_tail->size = le16_to_cpu(de->rec_len);
721 count++; 726 count++;
722 cond_resched(); 727 cond_resched();
723 } 728 }
724 /* XXX: do we need to check re 729 /* XXX: do we need to check rec_len == 0 case? -Chris */
725 de = ext3_next_entry(de); 730 de = ext3_next_entry(de);
726 } 731 }
727 return count; 732 return count;
728 } 733 }
729 734
730 /* Sort map by hash value */ 735 /* Sort map by hash value */
731 static void dx_sort_map (struct dx_map_entry * 736 static void dx_sort_map (struct dx_map_entry *map, unsigned count)
732 { 737 {
733 struct dx_map_entry *p, *q, *top = map 738 struct dx_map_entry *p, *q, *top = map + count - 1;
734 int more; 739 int more;
735 /* Combsort until bubble sort doesn't 740 /* Combsort until bubble sort doesn't suck */
736 while (count > 2) 741 while (count > 2)
737 { 742 {
738 count = count*10/13; 743 count = count*10/13;
739 if (count - 9 < 2) /* 9, 10 -> 744 if (count - 9 < 2) /* 9, 10 -> 11 */
740 count = 11; 745 count = 11;
741 for (p = top, q = p - count; q 746 for (p = top, q = p - count; q >= map; p--, q--)
742 if (p->hash < q->hash) 747 if (p->hash < q->hash)
743 swap(*p, *q); 748 swap(*p, *q);
744 } 749 }
745 /* Garden variety bubble sort */ 750 /* Garden variety bubble sort */
746 do { 751 do {
747 more = 0; 752 more = 0;
748 q = top; 753 q = top;
749 while (q-- > map) 754 while (q-- > map)
750 { 755 {
751 if (q[1].hash >= q[0]. 756 if (q[1].hash >= q[0].hash)
752 continue; 757 continue;
753 swap(*(q+1), *q); 758 swap(*(q+1), *q);
754 more = 1; 759 more = 1;
755 } 760 }
756 } while(more); 761 } while(more);
757 } 762 }
758 763
759 static void dx_insert_block(struct dx_frame *f 764 static void dx_insert_block(struct dx_frame *frame, u32 hash, u32 block)
760 { 765 {
761 struct dx_entry *entries = frame->entr 766 struct dx_entry *entries = frame->entries;
762 struct dx_entry *old = frame->at, *new 767 struct dx_entry *old = frame->at, *new = old + 1;
763 int count = dx_get_count(entries); 768 int count = dx_get_count(entries);
764 769
765 assert(count < dx_get_limit(entries)); 770 assert(count < dx_get_limit(entries));
766 assert(old < entries + count); 771 assert(old < entries + count);
767 memmove(new + 1, new, (char *)(entries 772 memmove(new + 1, new, (char *)(entries + count) - (char *)(new));
768 dx_set_hash(new, hash); 773 dx_set_hash(new, hash);
769 dx_set_block(new, block); 774 dx_set_block(new, block);
770 dx_set_count(entries, count + 1); 775 dx_set_count(entries, count + 1);
771 } 776 }
772 777
773 static void ext3_update_dx_flag(struct inode * 778 static void ext3_update_dx_flag(struct inode *inode)
774 { 779 {
775 if (!EXT3_HAS_COMPAT_FEATURE(inode->i_ 780 if (!EXT3_HAS_COMPAT_FEATURE(inode->i_sb,
776 EXT3_FEAT 781 EXT3_FEATURE_COMPAT_DIR_INDEX))
777 EXT3_I(inode)->i_flags &= ~EXT 782 EXT3_I(inode)->i_flags &= ~EXT3_INDEX_FL;
778 } 783 }
779 784
780 /* 785 /*
781 * NOTE! unlike strncmp, ext3_match returns 1 786 * NOTE! unlike strncmp, ext3_match returns 1 for success, 0 for failure.
782 * 787 *
783 * `len <= EXT3_NAME_LEN' is guaranteed by cal 788 * `len <= EXT3_NAME_LEN' is guaranteed by caller.
784 * `de != NULL' is guaranteed by caller. 789 * `de != NULL' is guaranteed by caller.
785 */ 790 */
786 static inline int ext3_match (int len, const c 791 static inline int ext3_match (int len, const char * const name,
787 struct ext3_dir_ 792 struct ext3_dir_entry_2 * de)
788 { 793 {
789 if (len != de->name_len) 794 if (len != de->name_len)
790 return 0; 795 return 0;
791 if (!de->inode) 796 if (!de->inode)
792 return 0; 797 return 0;
793 return !memcmp(name, de->name, len); 798 return !memcmp(name, de->name, len);
794 } 799 }
795 800
796 /* 801 /*
797 * Returns 0 if not found, -1 on failure, and 802 * Returns 0 if not found, -1 on failure, and 1 on success
798 */ 803 */
799 static inline int search_dirblock(struct buffe 804 static inline int search_dirblock(struct buffer_head * bh,
800 struct inode 805 struct inode *dir,
801 struct dentr !! 806 struct qstr *child,
802 unsigned lon 807 unsigned long offset,
803 struct ext3_ 808 struct ext3_dir_entry_2 ** res_dir)
804 { 809 {
805 struct ext3_dir_entry_2 * de; 810 struct ext3_dir_entry_2 * de;
806 char * dlimit; 811 char * dlimit;
807 int de_len; 812 int de_len;
808 const char *name = dentry->d_name.name !! 813 const char *name = child->name;
809 int namelen = dentry->d_name.len; !! 814 int namelen = child->len;
810 815
811 de = (struct ext3_dir_entry_2 *) bh->b 816 de = (struct ext3_dir_entry_2 *) bh->b_data;
812 dlimit = bh->b_data + dir->i_sb->s_blo 817 dlimit = bh->b_data + dir->i_sb->s_blocksize;
813 while ((char *) de < dlimit) { 818 while ((char *) de < dlimit) {
814 /* this code is executed quadr 819 /* this code is executed quadratically often */
815 /* do minimal checking `by han 820 /* do minimal checking `by hand' */
816 821
817 if ((char *) de + namelen <= d 822 if ((char *) de + namelen <= dlimit &&
818 ext3_match (namelen, name, 823 ext3_match (namelen, name, de)) {
819 /* found a match - jus 824 /* found a match - just to be sure, do a full check */
820 if (!ext3_check_dir_en 825 if (!ext3_check_dir_entry("ext3_find_entry",
821 826 dir, de, bh, offset))
822 return -1; 827 return -1;
823 *res_dir = de; 828 *res_dir = de;
824 return 1; 829 return 1;
825 } 830 }
826 /* prevent looping on a bad bl 831 /* prevent looping on a bad block */
827 de_len = ext3_rec_len_from_dis 832 de_len = ext3_rec_len_from_disk(de->rec_len);
828 if (de_len <= 0) 833 if (de_len <= 0)
829 return -1; 834 return -1;
830 offset += de_len; 835 offset += de_len;
831 de = (struct ext3_dir_entry_2 836 de = (struct ext3_dir_entry_2 *) ((char *) de + de_len);
832 } 837 }
833 return 0; 838 return 0;
834 } 839 }
835 840
836 841
837 /* 842 /*
838 * ext3_find_entry() 843 * ext3_find_entry()
839 * 844 *
840 * finds an entry in the specified directory w 845 * finds an entry in the specified directory with the wanted name. It
841 * returns the cache buffer in which the entry 846 * returns the cache buffer in which the entry was found, and the entry
842 * itself (as a parameter - res_dir). It does 847 * itself (as a parameter - res_dir). It does NOT read the inode of the
843 * entry - you'll have to do that yourself if 848 * entry - you'll have to do that yourself if you want to.
844 * 849 *
845 * The returned buffer_head has ->b_count elev 850 * The returned buffer_head has ->b_count elevated. The caller is expected
846 * to brelse() it when appropriate. 851 * to brelse() it when appropriate.
847 */ 852 */
848 static struct buffer_head * ext3_find_entry (s !! 853 static struct buffer_head *ext3_find_entry(struct inode *dir,
849 struct !! 854 struct qstr *entry,
>> 855 struct ext3_dir_entry_2 **res_dir)
850 { 856 {
851 struct super_block * sb; 857 struct super_block * sb;
852 struct buffer_head * bh_use[NAMEI_RA_S 858 struct buffer_head * bh_use[NAMEI_RA_SIZE];
853 struct buffer_head * bh, *ret = NULL; 859 struct buffer_head * bh, *ret = NULL;
854 unsigned long start, block, b; 860 unsigned long start, block, b;
855 int ra_max = 0; /* Number of b 861 int ra_max = 0; /* Number of bh's in the readahead
856 buffer, bh_ 862 buffer, bh_use[] */
857 int ra_ptr = 0; /* Current ind 863 int ra_ptr = 0; /* Current index into readahead
858 buffer */ 864 buffer */
859 int num = 0; 865 int num = 0;
860 int nblocks, i, err; 866 int nblocks, i, err;
861 struct inode *dir = dentry->d_parent-> <<
862 int namelen; 867 int namelen;
863 868
864 *res_dir = NULL; 869 *res_dir = NULL;
865 sb = dir->i_sb; 870 sb = dir->i_sb;
866 namelen = dentry->d_name.len; !! 871 namelen = entry->len;
867 if (namelen > EXT3_NAME_LEN) 872 if (namelen > EXT3_NAME_LEN)
868 return NULL; 873 return NULL;
869 if (is_dx(dir)) { 874 if (is_dx(dir)) {
870 bh = ext3_dx_find_entry(dentry !! 875 bh = ext3_dx_find_entry(dir, entry, res_dir, &err);
871 /* 876 /*
872 * On success, or if the error 877 * On success, or if the error was file not found,
873 * return. Otherwise, fall ba 878 * return. Otherwise, fall back to doing a search the
874 * old fashioned way. 879 * old fashioned way.
875 */ 880 */
876 if (bh || (err != ERR_BAD_DX_D 881 if (bh || (err != ERR_BAD_DX_DIR))
877 return bh; 882 return bh;
878 dxtrace(printk("ext3_find_entr 883 dxtrace(printk("ext3_find_entry: dx failed, falling back\n"));
879 } 884 }
880 nblocks = dir->i_size >> EXT3_BLOCK_SI 885 nblocks = dir->i_size >> EXT3_BLOCK_SIZE_BITS(sb);
881 start = EXT3_I(dir)->i_dir_start_looku 886 start = EXT3_I(dir)->i_dir_start_lookup;
882 if (start >= nblocks) 887 if (start >= nblocks)
883 start = 0; 888 start = 0;
884 block = start; 889 block = start;
885 restart: 890 restart:
886 do { 891 do {
887 /* 892 /*
888 * We deal with the read-ahead 893 * We deal with the read-ahead logic here.
889 */ 894 */
890 if (ra_ptr >= ra_max) { 895 if (ra_ptr >= ra_max) {
891 /* Refill the readahea 896 /* Refill the readahead buffer */
892 ra_ptr = 0; 897 ra_ptr = 0;
893 b = block; 898 b = block;
894 for (ra_max = 0; ra_ma 899 for (ra_max = 0; ra_max < NAMEI_RA_SIZE; ra_max++) {
895 /* 900 /*
896 * Terminate i 901 * Terminate if we reach the end of the
897 * directory a 902 * directory and must wrap, or if our
898 * search has 903 * search has finished at this block.
899 */ 904 */
900 if (b >= nbloc 905 if (b >= nblocks || (num && block == start)) {
901 bh_use 906 bh_use[ra_max] = NULL;
902 break; 907 break;
903 } 908 }
904 num++; 909 num++;
905 bh = ext3_getb 910 bh = ext3_getblk(NULL, dir, b++, 0, &err);
906 bh_use[ra_max] 911 bh_use[ra_max] = bh;
907 if (bh) 912 if (bh)
908 ll_rw_ 913 ll_rw_block(READ_META, 1, &bh);
909 } 914 }
910 } 915 }
911 if ((bh = bh_use[ra_ptr++]) == 916 if ((bh = bh_use[ra_ptr++]) == NULL)
912 goto next; 917 goto next;
913 wait_on_buffer(bh); 918 wait_on_buffer(bh);
914 if (!buffer_uptodate(bh)) { 919 if (!buffer_uptodate(bh)) {
915 /* read error, skip bl 920 /* read error, skip block & hope for the best */
916 ext3_error(sb, __FUNCT !! 921 ext3_error(sb, __func__, "reading directory #%lu "
917 "offset %lu 922 "offset %lu", dir->i_ino, block);
918 brelse(bh); 923 brelse(bh);
919 goto next; 924 goto next;
920 } 925 }
921 i = search_dirblock(bh, dir, d !! 926 i = search_dirblock(bh, dir, entry,
922 block << EXT3_BLOC 927 block << EXT3_BLOCK_SIZE_BITS(sb), res_dir);
923 if (i == 1) { 928 if (i == 1) {
924 EXT3_I(dir)->i_dir_sta 929 EXT3_I(dir)->i_dir_start_lookup = block;
925 ret = bh; 930 ret = bh;
926 goto cleanup_and_exit; 931 goto cleanup_and_exit;
927 } else { 932 } else {
928 brelse(bh); 933 brelse(bh);
929 if (i < 0) 934 if (i < 0)
930 goto cleanup_a 935 goto cleanup_and_exit;
931 } 936 }
932 next: 937 next:
933 if (++block >= nblocks) 938 if (++block >= nblocks)
934 block = 0; 939 block = 0;
935 } while (block != start); 940 } while (block != start);
936 941
937 /* 942 /*
938 * If the directory has grown while we 943 * If the directory has grown while we were searching, then
939 * search the last part of the directo 944 * search the last part of the directory before giving up.
940 */ 945 */
941 block = nblocks; 946 block = nblocks;
942 nblocks = dir->i_size >> EXT3_BLOCK_SI 947 nblocks = dir->i_size >> EXT3_BLOCK_SIZE_BITS(sb);
943 if (block < nblocks) { 948 if (block < nblocks) {
944 start = 0; 949 start = 0;
945 goto restart; 950 goto restart;
946 } 951 }
947 952
948 cleanup_and_exit: 953 cleanup_and_exit:
949 /* Clean up the read-ahead blocks */ 954 /* Clean up the read-ahead blocks */
950 for (; ra_ptr < ra_max; ra_ptr++) 955 for (; ra_ptr < ra_max; ra_ptr++)
951 brelse (bh_use[ra_ptr]); 956 brelse (bh_use[ra_ptr]);
952 return ret; 957 return ret;
953 } 958 }
954 959
955 static struct buffer_head * ext3_dx_find_entry !! 960 static struct buffer_head * ext3_dx_find_entry(struct inode *dir,
956 struct ext3_dir_entry_2 !! 961 struct qstr *entry, struct ext3_dir_entry_2 **res_dir,
>> 962 int *err)
957 { 963 {
958 struct super_block * sb; 964 struct super_block * sb;
959 struct dx_hash_info hinfo; 965 struct dx_hash_info hinfo;
960 u32 hash; 966 u32 hash;
961 struct dx_frame frames[2], *frame; 967 struct dx_frame frames[2], *frame;
962 struct ext3_dir_entry_2 *de, *top; 968 struct ext3_dir_entry_2 *de, *top;
963 struct buffer_head *bh; 969 struct buffer_head *bh;
964 unsigned long block; 970 unsigned long block;
965 int retval; 971 int retval;
966 int namelen = dentry->d_name.len; !! 972 int namelen = entry->len;
967 const u8 *name = dentry->d_name.name; !! 973 const u8 *name = entry->name;
968 struct inode *dir = dentry->d_parent-> <<
969 974
970 sb = dir->i_sb; 975 sb = dir->i_sb;
971 /* NFS may look up ".." - look at dx_r 976 /* NFS may look up ".." - look at dx_root directory block */
972 if (namelen > 2 || name[0] != '.'||(na !! 977 if (namelen > 2 || name[0] != '.'|| (namelen == 2 && name[1] != '.')) {
973 if (!(frame = dx_probe(dentry, !! 978 if (!(frame = dx_probe(entry, dir, &hinfo, frames, err)))
974 return NULL; 979 return NULL;
975 } else { 980 } else {
976 frame = frames; 981 frame = frames;
977 frame->bh = NULL; 982 frame->bh = NULL; /* for dx_release() */
978 frame->at = (struct dx_entry * 983 frame->at = (struct dx_entry *)frames; /* hack for zero entry*/
979 dx_set_block(frame->at, 0); 984 dx_set_block(frame->at, 0); /* dx_root block is 0 */
980 } 985 }
981 hash = hinfo.hash; 986 hash = hinfo.hash;
982 do { 987 do {
983 block = dx_get_block(frame->at 988 block = dx_get_block(frame->at);
984 if (!(bh = ext3_bread (NULL,di 989 if (!(bh = ext3_bread (NULL,dir, block, 0, err)))
985 goto errout; 990 goto errout;
986 de = (struct ext3_dir_entry_2 991 de = (struct ext3_dir_entry_2 *) bh->b_data;
987 top = (struct ext3_dir_entry_2 992 top = (struct ext3_dir_entry_2 *) ((char *) de + sb->s_blocksize -
988 EXT3_DI 993 EXT3_DIR_REC_LEN(0));
989 for (; de < top; de = ext3_nex !! 994 for (; de < top; de = ext3_next_entry(de)) {
990 if (ext3_match (namelen, name, !! 995 int off = (block << EXT3_BLOCK_SIZE_BITS(sb))
991 if (!ext3_check_dir_en !! 996 + ((char *) de - bh->b_data);
992 !! 997
993 (block<<EXT3 !! 998 if (!ext3_check_dir_entry(__func__, dir, de, bh, off)) {
994 +((c !! 999 brelse(bh);
995 brelse (bh); <<
996 *err = ERR_BAD 1000 *err = ERR_BAD_DX_DIR;
997 goto errout; 1001 goto errout;
998 } 1002 }
999 *res_dir = de; !! 1003
1000 dx_release (frames); !! 1004 if (ext3_match(namelen, name, de)) {
1001 return bh; !! 1005 *res_dir = de;
>> 1006 dx_release(frames);
>> 1007 return bh;
>> 1008 }
1002 } 1009 }
1003 brelse (bh); 1010 brelse (bh);
1004 /* Check to see if we should 1011 /* Check to see if we should continue to search */
1005 retval = ext3_htree_next_bloc 1012 retval = ext3_htree_next_block(dir, hash, frame,
1006 1013 frames, NULL);
1007 if (retval < 0) { 1014 if (retval < 0) {
1008 ext3_warning(sb, __FU !! 1015 ext3_warning(sb, __func__,
1009 "error reading i 1016 "error reading index page in directory #%lu",
1010 dir->i_ino); 1017 dir->i_ino);
1011 *err = retval; 1018 *err = retval;
1012 goto errout; 1019 goto errout;
1013 } 1020 }
1014 } while (retval == 1); 1021 } while (retval == 1);
1015 1022
1016 *err = -ENOENT; 1023 *err = -ENOENT;
1017 errout: 1024 errout:
1018 dxtrace(printk("%s not found\n", name 1025 dxtrace(printk("%s not found\n", name));
1019 dx_release (frames); 1026 dx_release (frames);
1020 return NULL; 1027 return NULL;
1021 } 1028 }
1022 1029
1023 static struct dentry *ext3_lookup(struct inod 1030 static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
1024 { 1031 {
1025 struct inode * inode; 1032 struct inode * inode;
1026 struct ext3_dir_entry_2 * de; 1033 struct ext3_dir_entry_2 * de;
1027 struct buffer_head * bh; 1034 struct buffer_head * bh;
1028 1035
1029 if (dentry->d_name.len > EXT3_NAME_LE 1036 if (dentry->d_name.len > EXT3_NAME_LEN)
1030 return ERR_PTR(-ENAMETOOLONG) 1037 return ERR_PTR(-ENAMETOOLONG);
1031 1038
1032 bh = ext3_find_entry(dentry, &de); !! 1039 bh = ext3_find_entry(dir, &dentry->d_name, &de);
1033 inode = NULL; 1040 inode = NULL;
1034 if (bh) { 1041 if (bh) {
1035 unsigned long ino = le32_to_c 1042 unsigned long ino = le32_to_cpu(de->inode);
1036 brelse (bh); 1043 brelse (bh);
1037 if (!ext3_valid_inum(dir->i_s 1044 if (!ext3_valid_inum(dir->i_sb, ino)) {
1038 ext3_error(dir->i_sb, 1045 ext3_error(dir->i_sb, "ext3_lookup",
1039 "bad inode 1046 "bad inode number: %lu", ino);
1040 return ERR_PTR(-EIO); 1047 return ERR_PTR(-EIO);
1041 } 1048 }
1042 inode = ext3_iget(dir->i_sb, 1049 inode = ext3_iget(dir->i_sb, ino);
1043 if (IS_ERR(inode)) !! 1050 if (unlikely(IS_ERR(inode))) {
1044 return ERR_CAST(inode !! 1051 if (PTR_ERR(inode) == -ESTALE) {
>> 1052 ext3_error(dir->i_sb, __func__,
>> 1053 "deleted inode referenced: %lu",
>> 1054 ino);
>> 1055 return ERR_PTR(-EIO);
>> 1056 } else {
>> 1057 return ERR_CAST(inode);
>> 1058 }
>> 1059 }
1045 } 1060 }
1046 return d_splice_alias(inode, dentry); 1061 return d_splice_alias(inode, dentry);
1047 } 1062 }
1048 1063
1049 1064
1050 struct dentry *ext3_get_parent(struct dentry 1065 struct dentry *ext3_get_parent(struct dentry *child)
1051 { 1066 {
1052 unsigned long ino; 1067 unsigned long ino;
1053 struct dentry *parent; !! 1068 struct qstr dotdot = {.name = "..", .len = 2};
1054 struct inode *inode; <<
1055 struct dentry dotdot; <<
1056 struct ext3_dir_entry_2 * de; 1069 struct ext3_dir_entry_2 * de;
1057 struct buffer_head *bh; 1070 struct buffer_head *bh;
1058 1071
1059 dotdot.d_name.name = ".."; !! 1072 bh = ext3_find_entry(child->d_inode, &dotdot, &de);
1060 dotdot.d_name.len = 2; <<
1061 dotdot.d_parent = child; /* confusing <<
1062 <<
1063 bh = ext3_find_entry(&dotdot, &de); <<
1064 inode = NULL; <<
1065 if (!bh) 1073 if (!bh)
1066 return ERR_PTR(-ENOENT); 1074 return ERR_PTR(-ENOENT);
1067 ino = le32_to_cpu(de->inode); 1075 ino = le32_to_cpu(de->inode);
1068 brelse(bh); 1076 brelse(bh);
1069 1077
1070 if (!ext3_valid_inum(child->d_inode-> 1078 if (!ext3_valid_inum(child->d_inode->i_sb, ino)) {
1071 ext3_error(child->d_inode->i_ 1079 ext3_error(child->d_inode->i_sb, "ext3_get_parent",
1072 "bad inode number: 1080 "bad inode number: %lu", ino);
1073 return ERR_PTR(-EIO); 1081 return ERR_PTR(-EIO);
1074 } 1082 }
1075 1083
1076 inode = ext3_iget(child->d_inode->i_s !! 1084 return d_obtain_alias(ext3_iget(child->d_inode->i_sb, ino));
1077 if (IS_ERR(inode)) <<
1078 return ERR_CAST(inode); <<
1079 <<
1080 parent = d_alloc_anon(inode); <<
1081 if (!parent) { <<
1082 iput(inode); <<
1083 parent = ERR_PTR(-ENOMEM); <<
1084 } <<
1085 return parent; <<
1086 } 1085 }
1087 1086
1088 #define S_SHIFT 12 1087 #define S_SHIFT 12
1089 static unsigned char ext3_type_by_mode[S_IFMT 1088 static unsigned char ext3_type_by_mode[S_IFMT >> S_SHIFT] = {
1090 [S_IFREG >> S_SHIFT] = EXT3_FT_REG 1089 [S_IFREG >> S_SHIFT] = EXT3_FT_REG_FILE,
1091 [S_IFDIR >> S_SHIFT] = EXT3_FT_DIR 1090 [S_IFDIR >> S_SHIFT] = EXT3_FT_DIR,
1092 [S_IFCHR >> S_SHIFT] = EXT3_FT_CHR 1091 [S_IFCHR >> S_SHIFT] = EXT3_FT_CHRDEV,
1093 [S_IFBLK >> S_SHIFT] = EXT3_FT_BLK 1092 [S_IFBLK >> S_SHIFT] = EXT3_FT_BLKDEV,
1094 [S_IFIFO >> S_SHIFT] = EXT3_FT_FIF 1093 [S_IFIFO >> S_SHIFT] = EXT3_FT_FIFO,
1095 [S_IFSOCK >> S_SHIFT] = EXT3_FT_SOC 1094 [S_IFSOCK >> S_SHIFT] = EXT3_FT_SOCK,
1096 [S_IFLNK >> S_SHIFT] = EXT3_FT_SYM 1095 [S_IFLNK >> S_SHIFT] = EXT3_FT_SYMLINK,
1097 }; 1096 };
1098 1097
1099 static inline void ext3_set_de_type(struct su 1098 static inline void ext3_set_de_type(struct super_block *sb,
1100 struct ext3_d 1099 struct ext3_dir_entry_2 *de,
1101 umode_t mode) 1100 umode_t mode) {
1102 if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT 1101 if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_FILETYPE))
1103 de->file_type = ext3_type_by_ 1102 de->file_type = ext3_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
1104 } 1103 }
1105 1104
1106 /* 1105 /*
1107 * Move count entries from end of map between 1106 * Move count entries from end of map between two memory locations.
1108 * Returns pointer to last entry moved. 1107 * Returns pointer to last entry moved.
1109 */ 1108 */
1110 static struct ext3_dir_entry_2 * 1109 static struct ext3_dir_entry_2 *
1111 dx_move_dirents(char *from, char *to, struct 1110 dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
1112 { 1111 {
1113 unsigned rec_len = 0; 1112 unsigned rec_len = 0;
1114 1113
1115 while (count--) { 1114 while (count--) {
1116 struct ext3_dir_entry_2 *de = 1115 struct ext3_dir_entry_2 *de = (struct ext3_dir_entry_2 *) (from + map->offs);
1117 rec_len = EXT3_DIR_REC_LEN(de 1116 rec_len = EXT3_DIR_REC_LEN(de->name_len);
1118 memcpy (to, de, rec_len); 1117 memcpy (to, de, rec_len);
1119 ((struct ext3_dir_entry_2 *) 1118 ((struct ext3_dir_entry_2 *) to)->rec_len =
1120 ext3_rec_len_ 1119 ext3_rec_len_to_disk(rec_len);
1121 de->inode = 0; 1120 de->inode = 0;
1122 map++; 1121 map++;
1123 to += rec_len; 1122 to += rec_len;
1124 } 1123 }
1125 return (struct ext3_dir_entry_2 *) (t 1124 return (struct ext3_dir_entry_2 *) (to - rec_len);
1126 } 1125 }
1127 1126
1128 /* 1127 /*
1129 * Compact each dir entry in the range to the 1128 * Compact each dir entry in the range to the minimal rec_len.
1130 * Returns pointer to last entry in range. 1129 * Returns pointer to last entry in range.
1131 */ 1130 */
1132 static struct ext3_dir_entry_2* dx_pack_diren !! 1131 static struct ext3_dir_entry_2 *dx_pack_dirents(char *base, unsigned blocksize)
1133 { 1132 {
1134 struct ext3_dir_entry_2 *next, *to, * !! 1133 struct ext3_dir_entry_2 *next, *to, *prev;
>> 1134 struct ext3_dir_entry_2 *de = (struct ext3_dir_entry_2 *)base;
1135 unsigned rec_len = 0; 1135 unsigned rec_len = 0;
1136 1136
1137 prev = to = de; 1137 prev = to = de;
1138 while ((char*)de < base + size) { !! 1138 while ((char *)de < base + blocksize) {
1139 next = ext3_next_entry(de); 1139 next = ext3_next_entry(de);
1140 if (de->inode && de->name_len 1140 if (de->inode && de->name_len) {
1141 rec_len = EXT3_DIR_RE 1141 rec_len = EXT3_DIR_REC_LEN(de->name_len);
1142 if (de > to) 1142 if (de > to)
1143 memmove(to, d 1143 memmove(to, de, rec_len);
1144 to->rec_len = ext3_re 1144 to->rec_len = ext3_rec_len_to_disk(rec_len);
1145 prev = to; 1145 prev = to;
1146 to = (struct ext3_dir 1146 to = (struct ext3_dir_entry_2 *) (((char *) to) + rec_len);
1147 } 1147 }
1148 de = next; 1148 de = next;
1149 } 1149 }
1150 return prev; 1150 return prev;
1151 } 1151 }
1152 1152
1153 /* 1153 /*
1154 * Split a full leaf block to make room for a 1154 * Split a full leaf block to make room for a new dir entry.
1155 * Allocate a new block, and move entries so 1155 * Allocate a new block, and move entries so that they are approx. equally full.
1156 * Returns pointer to de in block into which 1156 * Returns pointer to de in block into which the new entry will be inserted.
1157 */ 1157 */
1158 static struct ext3_dir_entry_2 *do_split(hand 1158 static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
1159 struct buffer_head ** 1159 struct buffer_head **bh,struct dx_frame *frame,
1160 struct dx_hash_info * 1160 struct dx_hash_info *hinfo, int *error)
1161 { 1161 {
1162 unsigned blocksize = dir->i_sb->s_blo 1162 unsigned blocksize = dir->i_sb->s_blocksize;
1163 unsigned count, continued; 1163 unsigned count, continued;
1164 struct buffer_head *bh2; 1164 struct buffer_head *bh2;
1165 u32 newblock; 1165 u32 newblock;
1166 u32 hash2; 1166 u32 hash2;
1167 struct dx_map_entry *map; 1167 struct dx_map_entry *map;
1168 char *data1 = (*bh)->b_data, *data2; 1168 char *data1 = (*bh)->b_data, *data2;
1169 unsigned split, move, size, i; !! 1169 unsigned split, move, size;
1170 struct ext3_dir_entry_2 *de = NULL, * 1170 struct ext3_dir_entry_2 *de = NULL, *de2;
1171 int err = 0; !! 1171 int err = 0, i;
1172 1172
1173 bh2 = ext3_append (handle, dir, &newb 1173 bh2 = ext3_append (handle, dir, &newblock, &err);
1174 if (!(bh2)) { 1174 if (!(bh2)) {
1175 brelse(*bh); 1175 brelse(*bh);
1176 *bh = NULL; 1176 *bh = NULL;
1177 goto errout; 1177 goto errout;
1178 } 1178 }
1179 1179
1180 BUFFER_TRACE(*bh, "get_write_access") 1180 BUFFER_TRACE(*bh, "get_write_access");
1181 err = ext3_journal_get_write_access(h 1181 err = ext3_journal_get_write_access(handle, *bh);
1182 if (err) 1182 if (err)
1183 goto journal_error; 1183 goto journal_error;
1184 1184
1185 BUFFER_TRACE(frame->bh, "get_write_ac 1185 BUFFER_TRACE(frame->bh, "get_write_access");
1186 err = ext3_journal_get_write_access(h 1186 err = ext3_journal_get_write_access(handle, frame->bh);
1187 if (err) 1187 if (err)
1188 goto journal_error; 1188 goto journal_error;
1189 1189
1190 data2 = bh2->b_data; 1190 data2 = bh2->b_data;
1191 1191
1192 /* create map in the end of data2 blo 1192 /* create map in the end of data2 block */
1193 map = (struct dx_map_entry *) (data2 1193 map = (struct dx_map_entry *) (data2 + blocksize);
1194 count = dx_make_map ((struct ext3_dir 1194 count = dx_make_map ((struct ext3_dir_entry_2 *) data1,
1195 blocksize, hinfo 1195 blocksize, hinfo, map);
1196 map -= count; 1196 map -= count;
1197 dx_sort_map (map, count); 1197 dx_sort_map (map, count);
1198 /* Split the existing block in the mi 1198 /* Split the existing block in the middle, size-wise */
1199 size = 0; 1199 size = 0;
1200 move = 0; 1200 move = 0;
1201 for (i = count-1; i >= 0; i--) { 1201 for (i = count-1; i >= 0; i--) {
1202 /* is more than half of this 1202 /* is more than half of this entry in 2nd half of the block? */
1203 if (size + map[i].size/2 > bl 1203 if (size + map[i].size/2 > blocksize/2)
1204 break; 1204 break;
1205 size += map[i].size; 1205 size += map[i].size;
1206 move++; 1206 move++;
1207 } 1207 }
1208 /* map index at which we will split * 1208 /* map index at which we will split */
1209 split = count - move; 1209 split = count - move;
1210 hash2 = map[split].hash; 1210 hash2 = map[split].hash;
1211 continued = hash2 == map[split - 1].h 1211 continued = hash2 == map[split - 1].hash;
1212 dxtrace(printk("Split block %i at %x, 1212 dxtrace(printk("Split block %i at %x, %i/%i\n",
1213 dx_get_block(frame->at), hash 1213 dx_get_block(frame->at), hash2, split, count-split));
1214 1214
1215 /* Fancy dance to stay within two buf 1215 /* Fancy dance to stay within two buffers */
1216 de2 = dx_move_dirents(data1, data2, m 1216 de2 = dx_move_dirents(data1, data2, map + split, count - split);
1217 de = dx_pack_dirents(data1,blocksize) 1217 de = dx_pack_dirents(data1,blocksize);
1218 de->rec_len = ext3_rec_len_to_disk(da 1218 de->rec_len = ext3_rec_len_to_disk(data1 + blocksize - (char *) de);
1219 de2->rec_len = ext3_rec_len_to_disk(d 1219 de2->rec_len = ext3_rec_len_to_disk(data2 + blocksize - (char *) de2);
1220 dxtrace(dx_show_leaf (hinfo, (struct 1220 dxtrace(dx_show_leaf (hinfo, (struct ext3_dir_entry_2 *) data1, blocksize, 1));
1221 dxtrace(dx_show_leaf (hinfo, (struct 1221 dxtrace(dx_show_leaf (hinfo, (struct ext3_dir_entry_2 *) data2, blocksize, 1));
1222 1222
1223 /* Which block gets the new entry? */ 1223 /* Which block gets the new entry? */
1224 if (hinfo->hash >= hash2) 1224 if (hinfo->hash >= hash2)
1225 { 1225 {
1226 swap(*bh, bh2); 1226 swap(*bh, bh2);
1227 de = de2; 1227 de = de2;
1228 } 1228 }
1229 dx_insert_block (frame, hash2 + conti 1229 dx_insert_block (frame, hash2 + continued, newblock);
1230 err = ext3_journal_dirty_metadata (ha 1230 err = ext3_journal_dirty_metadata (handle, bh2);
1231 if (err) 1231 if (err)
1232 goto journal_error; 1232 goto journal_error;
1233 err = ext3_journal_dirty_metadata (ha 1233 err = ext3_journal_dirty_metadata (handle, frame->bh);
1234 if (err) 1234 if (err)
1235 goto journal_error; 1235 goto journal_error;
1236 brelse (bh2); 1236 brelse (bh2);
1237 dxtrace(dx_show_index ("frame", frame 1237 dxtrace(dx_show_index ("frame", frame->entries));
1238 return de; 1238 return de;
1239 1239
1240 journal_error: 1240 journal_error:
1241 brelse(*bh); 1241 brelse(*bh);
1242 brelse(bh2); 1242 brelse(bh2);
1243 *bh = NULL; 1243 *bh = NULL;
1244 ext3_std_error(dir->i_sb, err); 1244 ext3_std_error(dir->i_sb, err);
1245 errout: 1245 errout:
1246 *error = err; 1246 *error = err;
1247 return NULL; 1247 return NULL;
1248 } 1248 }
1249 1249
1250 1250
1251 /* 1251 /*
1252 * Add a new entry into a directory (leaf) bl 1252 * Add a new entry into a directory (leaf) block. If de is non-NULL,
1253 * it points to a directory entry which is gu 1253 * it points to a directory entry which is guaranteed to be large
1254 * enough for new directory entry. If de is 1254 * enough for new directory entry. If de is NULL, then
1255 * add_dirent_to_buf will attempt search the 1255 * add_dirent_to_buf will attempt search the directory block for
1256 * space. It will return -ENOSPC if no space 1256 * space. It will return -ENOSPC if no space is available, and -EIO
1257 * and -EEXIST if directory entry already exi 1257 * and -EEXIST if directory entry already exists.
1258 * 1258 *
1259 * NOTE! bh is NOT released in the case wher 1259 * NOTE! bh is NOT released in the case where ENOSPC is returned. In
1260 * all other cases bh is released. 1260 * all other cases bh is released.
1261 */ 1261 */
1262 static int add_dirent_to_buf(handle_t *handle 1262 static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
1263 struct inode *in 1263 struct inode *inode, struct ext3_dir_entry_2 *de,
1264 struct buffer_he 1264 struct buffer_head * bh)
1265 { 1265 {
1266 struct inode *dir = dentry->d_pare 1266 struct inode *dir = dentry->d_parent->d_inode;
1267 const char *name = dentry->d_nam 1267 const char *name = dentry->d_name.name;
1268 int namelen = dentry->d_n 1268 int namelen = dentry->d_name.len;
1269 unsigned long offset = 0; 1269 unsigned long offset = 0;
1270 unsigned short reclen; 1270 unsigned short reclen;
1271 int nlen, rlen, err; 1271 int nlen, rlen, err;
1272 char *top; 1272 char *top;
1273 1273
1274 reclen = EXT3_DIR_REC_LEN(namelen); 1274 reclen = EXT3_DIR_REC_LEN(namelen);
1275 if (!de) { 1275 if (!de) {
1276 de = (struct ext3_dir_entry_2 1276 de = (struct ext3_dir_entry_2 *)bh->b_data;
1277 top = bh->b_data + dir->i_sb- 1277 top = bh->b_data + dir->i_sb->s_blocksize - reclen;
1278 while ((char *) de <= top) { 1278 while ((char *) de <= top) {
1279 if (!ext3_check_dir_e 1279 if (!ext3_check_dir_entry("ext3_add_entry", dir, de,
1280 1280 bh, offset)) {
1281 brelse (bh); 1281 brelse (bh);
1282 return -EIO; 1282 return -EIO;
1283 } 1283 }
1284 if (ext3_match (namel 1284 if (ext3_match (namelen, name, de)) {
1285 brelse (bh); 1285 brelse (bh);
1286 return -EEXIS 1286 return -EEXIST;
1287 } 1287 }
1288 nlen = EXT3_DIR_REC_L 1288 nlen = EXT3_DIR_REC_LEN(de->name_len);
1289 rlen = ext3_rec_len_f 1289 rlen = ext3_rec_len_from_disk(de->rec_len);
1290 if ((de->inode? rlen 1290 if ((de->inode? rlen - nlen: rlen) >= reclen)
1291 break; 1291 break;
1292 de = (struct ext3_dir 1292 de = (struct ext3_dir_entry_2 *)((char *)de + rlen);
1293 offset += rlen; 1293 offset += rlen;
1294 } 1294 }
1295 if ((char *) de > top) 1295 if ((char *) de > top)
1296 return -ENOSPC; 1296 return -ENOSPC;
1297 } 1297 }
1298 BUFFER_TRACE(bh, "get_write_access"); 1298 BUFFER_TRACE(bh, "get_write_access");
1299 err = ext3_journal_get_write_access(h 1299 err = ext3_journal_get_write_access(handle, bh);
1300 if (err) { 1300 if (err) {
1301 ext3_std_error(dir->i_sb, err 1301 ext3_std_error(dir->i_sb, err);
1302 brelse(bh); 1302 brelse(bh);
1303 return err; 1303 return err;
1304 } 1304 }
1305 1305
1306 /* By now the buffer is marked for jo 1306 /* By now the buffer is marked for journaling */
1307 nlen = EXT3_DIR_REC_LEN(de->name_len) 1307 nlen = EXT3_DIR_REC_LEN(de->name_len);
1308 rlen = ext3_rec_len_from_disk(de->rec 1308 rlen = ext3_rec_len_from_disk(de->rec_len);
1309 if (de->inode) { 1309 if (de->inode) {
1310 struct ext3_dir_entry_2 *de1 1310 struct ext3_dir_entry_2 *de1 = (struct ext3_dir_entry_2 *)((char *)de + nlen);
1311 de1->rec_len = ext3_rec_len_t 1311 de1->rec_len = ext3_rec_len_to_disk(rlen - nlen);
1312 de->rec_len = ext3_rec_len_to 1312 de->rec_len = ext3_rec_len_to_disk(nlen);
1313 de = de1; 1313 de = de1;
1314 } 1314 }
1315 de->file_type = EXT3_FT_UNKNOWN; 1315 de->file_type = EXT3_FT_UNKNOWN;
1316 if (inode) { 1316 if (inode) {
1317 de->inode = cpu_to_le32(inode 1317 de->inode = cpu_to_le32(inode->i_ino);
1318 ext3_set_de_type(dir->i_sb, d 1318 ext3_set_de_type(dir->i_sb, de, inode->i_mode);
1319 } else 1319 } else
1320 de->inode = 0; 1320 de->inode = 0;
1321 de->name_len = namelen; 1321 de->name_len = namelen;
1322 memcpy (de->name, name, namelen); 1322 memcpy (de->name, name, namelen);
1323 /* 1323 /*
1324 * XXX shouldn't update any times unt 1324 * XXX shouldn't update any times until successful
1325 * completion of syscall, but too man 1325 * completion of syscall, but too many callers depend
1326 * on this. 1326 * on this.
1327 * 1327 *
1328 * XXX similarly, too many callers de 1328 * XXX similarly, too many callers depend on
1329 * ext3_new_inode() setting the times 1329 * ext3_new_inode() setting the times, but error
1330 * recovery deletes the inode, so the 1330 * recovery deletes the inode, so the worst that can
1331 * happen is that the times are sligh 1331 * happen is that the times are slightly out of date
1332 * and/or different from the director 1332 * and/or different from the directory change time.
1333 */ 1333 */
1334 dir->i_mtime = dir->i_ctime = CURRENT 1334 dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
1335 ext3_update_dx_flag(dir); 1335 ext3_update_dx_flag(dir);
1336 dir->i_version++; 1336 dir->i_version++;
1337 ext3_mark_inode_dirty(handle, dir); 1337 ext3_mark_inode_dirty(handle, dir);
1338 BUFFER_TRACE(bh, "call ext3_journal_d 1338 BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
1339 err = ext3_journal_dirty_metadata(han 1339 err = ext3_journal_dirty_metadata(handle, bh);
1340 if (err) 1340 if (err)
1341 ext3_std_error(dir->i_sb, err 1341 ext3_std_error(dir->i_sb, err);
1342 brelse(bh); 1342 brelse(bh);
1343 return 0; 1343 return 0;
1344 } 1344 }
1345 1345
1346 /* 1346 /*
1347 * This converts a one block unindexed direct 1347 * This converts a one block unindexed directory to a 3 block indexed
1348 * directory, and adds the dentry to the inde 1348 * directory, and adds the dentry to the indexed directory.
1349 */ 1349 */
1350 static int make_indexed_dir(handle_t *handle, 1350 static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
1351 struct inode *ino 1351 struct inode *inode, struct buffer_head *bh)
1352 { 1352 {
1353 struct inode *dir = dentry->d_pare 1353 struct inode *dir = dentry->d_parent->d_inode;
1354 const char *name = dentry->d_nam 1354 const char *name = dentry->d_name.name;
1355 int namelen = dentry->d_n 1355 int namelen = dentry->d_name.len;
1356 struct buffer_head *bh2; 1356 struct buffer_head *bh2;
1357 struct dx_root *root; 1357 struct dx_root *root;
1358 struct dx_frame frames[2], *frame; 1358 struct dx_frame frames[2], *frame;
1359 struct dx_entry *entries; 1359 struct dx_entry *entries;
1360 struct ext3_dir_entry_2 *de, *de2; 1360 struct ext3_dir_entry_2 *de, *de2;
1361 char *data1, *top; 1361 char *data1, *top;
1362 unsigned len; 1362 unsigned len;
1363 int retval; 1363 int retval;
1364 unsigned blocksize; 1364 unsigned blocksize;
1365 struct dx_hash_info hinfo; 1365 struct dx_hash_info hinfo;
1366 u32 block; 1366 u32 block;
1367 struct fake_dirent *fde; 1367 struct fake_dirent *fde;
1368 1368
1369 blocksize = dir->i_sb->s_blocksize; 1369 blocksize = dir->i_sb->s_blocksize;
1370 dxtrace(printk("Creating index\n")); !! 1370 dxtrace(printk(KERN_DEBUG "Creating index: inode %lu\n", dir->i_ino));
1371 retval = ext3_journal_get_write_acces 1371 retval = ext3_journal_get_write_access(handle, bh);
1372 if (retval) { 1372 if (retval) {
1373 ext3_std_error(dir->i_sb, ret 1373 ext3_std_error(dir->i_sb, retval);
1374 brelse(bh); 1374 brelse(bh);
1375 return retval; 1375 return retval;
1376 } 1376 }
1377 root = (struct dx_root *) bh->b_data; 1377 root = (struct dx_root *) bh->b_data;
1378 1378
>> 1379 /* The 0th block becomes the root, move the dirents out */
>> 1380 fde = &root->dotdot;
>> 1381 de = (struct ext3_dir_entry_2 *)((char *)fde +
>> 1382 ext3_rec_len_from_disk(fde->rec_len));
>> 1383 if ((char *) de >= (((char *) root) + blocksize)) {
>> 1384 ext3_error(dir->i_sb, __func__,
>> 1385 "invalid rec_len for '..' in inode %lu",
>> 1386 dir->i_ino);
>> 1387 brelse(bh);
>> 1388 return -EIO;
>> 1389 }
>> 1390 len = ((char *) root) + blocksize - (char *) de;
>> 1391
1379 bh2 = ext3_append (handle, dir, &bloc 1392 bh2 = ext3_append (handle, dir, &block, &retval);
1380 if (!(bh2)) { 1393 if (!(bh2)) {
1381 brelse(bh); 1394 brelse(bh);
1382 return retval; 1395 return retval;
1383 } 1396 }
1384 EXT3_I(dir)->i_flags |= EXT3_INDEX_FL 1397 EXT3_I(dir)->i_flags |= EXT3_INDEX_FL;
1385 data1 = bh2->b_data; 1398 data1 = bh2->b_data;
1386 1399
1387 /* The 0th block becomes the root, mo <<
1388 fde = &root->dotdot; <<
1389 de = (struct ext3_dir_entry_2 *)((cha <<
1390 ext3_rec_len_from_dis <<
1391 len = ((char *) root) + blocksize - ( <<
1392 memcpy (data1, de, len); 1400 memcpy (data1, de, len);
1393 de = (struct ext3_dir_entry_2 *) data 1401 de = (struct ext3_dir_entry_2 *) data1;
1394 top = data1 + len; 1402 top = data1 + len;
1395 while ((char *)(de2 = ext3_next_entry 1403 while ((char *)(de2 = ext3_next_entry(de)) < top)
1396 de = de2; 1404 de = de2;
1397 de->rec_len = ext3_rec_len_to_disk(da 1405 de->rec_len = ext3_rec_len_to_disk(data1 + blocksize - (char *) de);
1398 /* Initialize the root; the dot diren 1406 /* Initialize the root; the dot dirents already exist */
1399 de = (struct ext3_dir_entry_2 *) (&ro 1407 de = (struct ext3_dir_entry_2 *) (&root->dotdot);
1400 de->rec_len = ext3_rec_len_to_disk(bl 1408 de->rec_len = ext3_rec_len_to_disk(blocksize - EXT3_DIR_REC_LEN(2));
1401 memset (&root->info, 0, sizeof(root-> 1409 memset (&root->info, 0, sizeof(root->info));
1402 root->info.info_length = sizeof(root- 1410 root->info.info_length = sizeof(root->info);
1403 root->info.hash_version = EXT3_SB(dir 1411 root->info.hash_version = EXT3_SB(dir->i_sb)->s_def_hash_version;
1404 entries = root->entries; 1412 entries = root->entries;
1405 dx_set_block (entries, 1); 1413 dx_set_block (entries, 1);
1406 dx_set_count (entries, 1); 1414 dx_set_count (entries, 1);
1407 dx_set_limit (entries, dx_root_limit( 1415 dx_set_limit (entries, dx_root_limit(dir, sizeof(root->info)));
1408 1416
1409 /* Initialize as for dx_probe */ 1417 /* Initialize as for dx_probe */
1410 hinfo.hash_version = root->info.hash_ 1418 hinfo.hash_version = root->info.hash_version;
>> 1419 if (hinfo.hash_version <= DX_HASH_TEA)
>> 1420 hinfo.hash_version += EXT3_SB(dir->i_sb)->s_hash_unsigned;
1411 hinfo.seed = EXT3_SB(dir->i_sb)->s_ha 1421 hinfo.seed = EXT3_SB(dir->i_sb)->s_hash_seed;
1412 ext3fs_dirhash(name, namelen, &hinfo) 1422 ext3fs_dirhash(name, namelen, &hinfo);
1413 frame = frames; 1423 frame = frames;
1414 frame->entries = entries; 1424 frame->entries = entries;
1415 frame->at = entries; 1425 frame->at = entries;
1416 frame->bh = bh; 1426 frame->bh = bh;
1417 bh = bh2; 1427 bh = bh2;
1418 de = do_split(handle,dir, &bh, frame, 1428 de = do_split(handle,dir, &bh, frame, &hinfo, &retval);
1419 dx_release (frames); 1429 dx_release (frames);
1420 if (!(de)) 1430 if (!(de))
1421 return retval; 1431 return retval;
1422 1432
1423 return add_dirent_to_buf(handle, dent 1433 return add_dirent_to_buf(handle, dentry, inode, de, bh);
1424 } 1434 }
1425 1435
1426 /* 1436 /*
1427 * ext3_add_entry() 1437 * ext3_add_entry()
1428 * 1438 *
1429 * adds a file entry to the specified directo 1439 * adds a file entry to the specified directory, using the same
1430 * semantics as ext3_find_entry(). It returns 1440 * semantics as ext3_find_entry(). It returns NULL if it failed.
1431 * 1441 *
1432 * NOTE!! The inode part of 'de' is left at 0 1442 * NOTE!! The inode part of 'de' is left at 0 - which means you
1433 * may not sleep between calling this and put 1443 * may not sleep between calling this and putting something into
1434 * the entry, as someone else might have used 1444 * the entry, as someone else might have used it while you slept.
1435 */ 1445 */
1436 static int ext3_add_entry (handle_t *handle, 1446 static int ext3_add_entry (handle_t *handle, struct dentry *dentry,
1437 struct inode *inode) 1447 struct inode *inode)
1438 { 1448 {
1439 struct inode *dir = dentry->d_parent- 1449 struct inode *dir = dentry->d_parent->d_inode;
1440 unsigned long offset; 1450 unsigned long offset;
1441 struct buffer_head * bh; 1451 struct buffer_head * bh;
1442 struct ext3_dir_entry_2 *de; 1452 struct ext3_dir_entry_2 *de;
1443 struct super_block * sb; 1453 struct super_block * sb;
1444 int retval; 1454 int retval;
1445 int dx_fallback=0; 1455 int dx_fallback=0;
1446 unsigned blocksize; 1456 unsigned blocksize;
1447 u32 block, blocks; 1457 u32 block, blocks;
1448 1458
1449 sb = dir->i_sb; 1459 sb = dir->i_sb;
1450 blocksize = sb->s_blocksize; 1460 blocksize = sb->s_blocksize;
1451 if (!dentry->d_name.len) 1461 if (!dentry->d_name.len)
1452 return -EINVAL; 1462 return -EINVAL;
1453 if (is_dx(dir)) { 1463 if (is_dx(dir)) {
1454 retval = ext3_dx_add_entry(ha 1464 retval = ext3_dx_add_entry(handle, dentry, inode);
1455 if (!retval || (retval != ERR 1465 if (!retval || (retval != ERR_BAD_DX_DIR))
1456 return retval; 1466 return retval;
1457 EXT3_I(dir)->i_flags &= ~EXT3 1467 EXT3_I(dir)->i_flags &= ~EXT3_INDEX_FL;
1458 dx_fallback++; 1468 dx_fallback++;
1459 ext3_mark_inode_dirty(handle, 1469 ext3_mark_inode_dirty(handle, dir);
1460 } 1470 }
1461 blocks = dir->i_size >> sb->s_blocksi 1471 blocks = dir->i_size >> sb->s_blocksize_bits;
1462 for (block = 0, offset = 0; block < b 1472 for (block = 0, offset = 0; block < blocks; block++) {
1463 bh = ext3_bread(handle, dir, 1473 bh = ext3_bread(handle, dir, block, 0, &retval);
1464 if(!bh) 1474 if(!bh)
1465 return retval; 1475 return retval;
1466 retval = add_dirent_to_buf(ha 1476 retval = add_dirent_to_buf(handle, dentry, inode, NULL, bh);
1467 if (retval != -ENOSPC) 1477 if (retval != -ENOSPC)
1468 return retval; 1478 return retval;
1469 1479
1470 if (blocks == 1 && !dx_fallba 1480 if (blocks == 1 && !dx_fallback &&
1471 EXT3_HAS_COMPAT_FEATURE(s 1481 EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_DIR_INDEX))
1472 return make_indexed_d 1482 return make_indexed_dir(handle, dentry, inode, bh);
1473 brelse(bh); 1483 brelse(bh);
1474 } 1484 }
1475 bh = ext3_append(handle, dir, &block, 1485 bh = ext3_append(handle, dir, &block, &retval);
1476 if (!bh) 1486 if (!bh)
1477 return retval; 1487 return retval;
1478 de = (struct ext3_dir_entry_2 *) bh-> 1488 de = (struct ext3_dir_entry_2 *) bh->b_data;
1479 de->inode = 0; 1489 de->inode = 0;
1480 de->rec_len = ext3_rec_len_to_disk(bl 1490 de->rec_len = ext3_rec_len_to_disk(blocksize);
1481 return add_dirent_to_buf(handle, dent 1491 return add_dirent_to_buf(handle, dentry, inode, de, bh);
1482 } 1492 }
1483 1493
1484 /* 1494 /*
1485 * Returns 0 for success, or a negative error 1495 * Returns 0 for success, or a negative error value
1486 */ 1496 */
1487 static int ext3_dx_add_entry(handle_t *handle 1497 static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
1488 struct inode *in 1498 struct inode *inode)
1489 { 1499 {
1490 struct dx_frame frames[2], *frame; 1500 struct dx_frame frames[2], *frame;
1491 struct dx_entry *entries, *at; 1501 struct dx_entry *entries, *at;
1492 struct dx_hash_info hinfo; 1502 struct dx_hash_info hinfo;
1493 struct buffer_head * bh; 1503 struct buffer_head * bh;
1494 struct inode *dir = dentry->d_parent- 1504 struct inode *dir = dentry->d_parent->d_inode;
1495 struct super_block * sb = dir->i_sb; 1505 struct super_block * sb = dir->i_sb;
1496 struct ext3_dir_entry_2 *de; 1506 struct ext3_dir_entry_2 *de;
1497 int err; 1507 int err;
1498 1508
1499 frame = dx_probe(dentry, NULL, &hinfo !! 1509 frame = dx_probe(&dentry->d_name, dir, &hinfo, frames, &err);
1500 if (!frame) 1510 if (!frame)
1501 return err; 1511 return err;
1502 entries = frame->entries; 1512 entries = frame->entries;
1503 at = frame->at; 1513 at = frame->at;
1504 1514
1505 if (!(bh = ext3_bread(handle,dir, dx_ 1515 if (!(bh = ext3_bread(handle,dir, dx_get_block(frame->at), 0, &err)))
1506 goto cleanup; 1516 goto cleanup;
1507 1517
1508 BUFFER_TRACE(bh, "get_write_access"); 1518 BUFFER_TRACE(bh, "get_write_access");
1509 err = ext3_journal_get_write_access(h 1519 err = ext3_journal_get_write_access(handle, bh);
1510 if (err) 1520 if (err)
1511 goto journal_error; 1521 goto journal_error;
1512 1522
1513 err = add_dirent_to_buf(handle, dentr 1523 err = add_dirent_to_buf(handle, dentry, inode, NULL, bh);
1514 if (err != -ENOSPC) { 1524 if (err != -ENOSPC) {
1515 bh = NULL; 1525 bh = NULL;
1516 goto cleanup; 1526 goto cleanup;
1517 } 1527 }
1518 1528
1519 /* Block full, should compress but fo 1529 /* Block full, should compress but for now just split */
1520 dxtrace(printk("using %u of %u node e 1530 dxtrace(printk("using %u of %u node entries\n",
1521 dx_get_count(entries), 1531 dx_get_count(entries), dx_get_limit(entries)));
1522 /* Need to split index? */ 1532 /* Need to split index? */
1523 if (dx_get_count(entries) == dx_get_l 1533 if (dx_get_count(entries) == dx_get_limit(entries)) {
1524 u32 newblock; 1534 u32 newblock;
1525 unsigned icount = dx_get_coun 1535 unsigned icount = dx_get_count(entries);
1526 int levels = frame - frames; 1536 int levels = frame - frames;
1527 struct dx_entry *entries2; 1537 struct dx_entry *entries2;
1528 struct dx_node *node2; 1538 struct dx_node *node2;
1529 struct buffer_head *bh2; 1539 struct buffer_head *bh2;
1530 1540
1531 if (levels && (dx_get_count(f 1541 if (levels && (dx_get_count(frames->entries) ==
1532 dx_get_limit(f 1542 dx_get_limit(frames->entries))) {
1533 ext3_warning(sb, __FU !! 1543 ext3_warning(sb, __func__,
1534 "Directo 1544 "Directory index full!");
1535 err = -ENOSPC; 1545 err = -ENOSPC;
1536 goto cleanup; 1546 goto cleanup;
1537 } 1547 }
1538 bh2 = ext3_append (handle, di 1548 bh2 = ext3_append (handle, dir, &newblock, &err);
1539 if (!(bh2)) 1549 if (!(bh2))
1540 goto cleanup; 1550 goto cleanup;
1541 node2 = (struct dx_node *)(bh 1551 node2 = (struct dx_node *)(bh2->b_data);
1542 entries2 = node2->entries; 1552 entries2 = node2->entries;
1543 node2->fake.rec_len = ext3_re 1553 node2->fake.rec_len = ext3_rec_len_to_disk(sb->s_blocksize);
1544 node2->fake.inode = 0; 1554 node2->fake.inode = 0;
1545 BUFFER_TRACE(frame->bh, "get_ 1555 BUFFER_TRACE(frame->bh, "get_write_access");
1546 err = ext3_journal_get_write_ 1556 err = ext3_journal_get_write_access(handle, frame->bh);
1547 if (err) 1557 if (err)
1548 goto journal_error; 1558 goto journal_error;
1549 if (levels) { 1559 if (levels) {
1550 unsigned icount1 = ic 1560 unsigned icount1 = icount/2, icount2 = icount - icount1;
1551 unsigned hash2 = dx_g 1561 unsigned hash2 = dx_get_hash(entries + icount1);
1552 dxtrace(printk("Split 1562 dxtrace(printk("Split index %i/%i\n", icount1, icount2));
1553 1563
1554 BUFFER_TRACE(frame->b 1564 BUFFER_TRACE(frame->bh, "get_write_access"); /* index root */
1555 err = ext3_journal_ge 1565 err = ext3_journal_get_write_access(handle,
1556 1566 frames[0].bh);
1557 if (err) 1567 if (err)
1558 goto journal_ 1568 goto journal_error;
1559 1569
1560 memcpy ((char *) entr 1570 memcpy ((char *) entries2, (char *) (entries + icount1),
1561 icount2 * siz 1571 icount2 * sizeof(struct dx_entry));
1562 dx_set_count (entries 1572 dx_set_count (entries, icount1);
1563 dx_set_count (entries 1573 dx_set_count (entries2, icount2);
1564 dx_set_limit (entries 1574 dx_set_limit (entries2, dx_node_limit(dir));
1565 1575
1566 /* Which index block 1576 /* Which index block gets the new entry? */
1567 if (at - entries >= i 1577 if (at - entries >= icount1) {
1568 frame->at = a 1578 frame->at = at = at - entries - icount1 + entries2;
1569 frame->entrie 1579 frame->entries = entries = entries2;
1570 swap(frame->b 1580 swap(frame->bh, bh2);
1571 } 1581 }
1572 dx_insert_block (fram 1582 dx_insert_block (frames + 0, hash2, newblock);
1573 dxtrace(dx_show_index 1583 dxtrace(dx_show_index ("node", frames[1].entries));
1574 dxtrace(dx_show_index 1584 dxtrace(dx_show_index ("node",
1575 ((struct dx_no 1585 ((struct dx_node *) bh2->b_data)->entries));
1576 err = ext3_journal_di 1586 err = ext3_journal_dirty_metadata(handle, bh2);
1577 if (err) 1587 if (err)
1578 goto journal_ 1588 goto journal_error;
1579 brelse (bh2); 1589 brelse (bh2);
1580 } else { 1590 } else {
1581 dxtrace(printk("Creat 1591 dxtrace(printk("Creating second level index...\n"));
1582 memcpy((char *) entri 1592 memcpy((char *) entries2, (char *) entries,
1583 icount * sizeo 1593 icount * sizeof(struct dx_entry));
1584 dx_set_limit(entries2 1594 dx_set_limit(entries2, dx_node_limit(dir));
1585 1595
1586 /* Set up root */ 1596 /* Set up root */
1587 dx_set_count(entries, 1597 dx_set_count(entries, 1);
1588 dx_set_block(entries 1598 dx_set_block(entries + 0, newblock);
1589 ((struct dx_root *) f 1599 ((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels = 1;
1590 1600
1591 /* Add new access pat 1601 /* Add new access path frame */
1592 frame = frames + 1; 1602 frame = frames + 1;
1593 frame->at = at = at - 1603 frame->at = at = at - entries + entries2;
1594 frame->entries = entr 1604 frame->entries = entries = entries2;
1595 frame->bh = bh2; 1605 frame->bh = bh2;
1596 err = ext3_journal_ge 1606 err = ext3_journal_get_write_access(handle,
1597 1607 frame->bh);
1598 if (err) 1608 if (err)
1599 goto journal_ 1609 goto journal_error;
1600 } 1610 }
1601 ext3_journal_dirty_metadata(h 1611 ext3_journal_dirty_metadata(handle, frames[0].bh);
1602 } 1612 }
1603 de = do_split(handle, dir, &bh, frame 1613 de = do_split(handle, dir, &bh, frame, &hinfo, &err);
1604 if (!de) 1614 if (!de)
1605 goto cleanup; 1615 goto cleanup;
1606 err = add_dirent_to_buf(handle, dentr 1616 err = add_dirent_to_buf(handle, dentry, inode, de, bh);
1607 bh = NULL; 1617 bh = NULL;
1608 goto cleanup; 1618 goto cleanup;
1609 1619
1610 journal_error: 1620 journal_error:
1611 ext3_std_error(dir->i_sb, err); 1621 ext3_std_error(dir->i_sb, err);
1612 cleanup: 1622 cleanup:
1613 if (bh) 1623 if (bh)
1614 brelse(bh); 1624 brelse(bh);
1615 dx_release(frames); 1625 dx_release(frames);
1616 return err; 1626 return err;
1617 } 1627 }
1618 1628
1619 /* 1629 /*
1620 * ext3_delete_entry deletes a directory entr 1630 * ext3_delete_entry deletes a directory entry by merging it with the
1621 * previous entry 1631 * previous entry
1622 */ 1632 */
1623 static int ext3_delete_entry (handle_t *handl 1633 static int ext3_delete_entry (handle_t *handle,
1624 struct inode * 1634 struct inode * dir,
1625 struct ext3_dir 1635 struct ext3_dir_entry_2 * de_del,
1626 struct buffer_h 1636 struct buffer_head * bh)
1627 { 1637 {
1628 struct ext3_dir_entry_2 * de, * pde; 1638 struct ext3_dir_entry_2 * de, * pde;
1629 int i; 1639 int i;
1630 1640
1631 i = 0; 1641 i = 0;
1632 pde = NULL; 1642 pde = NULL;
1633 de = (struct ext3_dir_entry_2 *) bh-> 1643 de = (struct ext3_dir_entry_2 *) bh->b_data;
1634 while (i < bh->b_size) { 1644 while (i < bh->b_size) {
1635 if (!ext3_check_dir_entry("ex 1645 if (!ext3_check_dir_entry("ext3_delete_entry", dir, de, bh, i))
1636 return -EIO; 1646 return -EIO;
1637 if (de == de_del) { 1647 if (de == de_del) {
1638 BUFFER_TRACE(bh, "get 1648 BUFFER_TRACE(bh, "get_write_access");
1639 ext3_journal_get_writ 1649 ext3_journal_get_write_access(handle, bh);
1640 if (pde) 1650 if (pde)
1641 pde->rec_len 1651 pde->rec_len = ext3_rec_len_to_disk(
1642 ext3_ 1652 ext3_rec_len_from_disk(pde->rec_len) +
1643 ext3_ 1653 ext3_rec_len_from_disk(de->rec_len));
1644 else 1654 else
1645 de->inode = 0 1655 de->inode = 0;
1646 dir->i_version++; 1656 dir->i_version++;
1647 BUFFER_TRACE(bh, "cal 1657 BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
1648 ext3_journal_dirty_me 1658 ext3_journal_dirty_metadata(handle, bh);
1649 return 0; 1659 return 0;
1650 } 1660 }
1651 i += ext3_rec_len_from_disk(d 1661 i += ext3_rec_len_from_disk(de->rec_len);
1652 pde = de; 1662 pde = de;
1653 de = ext3_next_entry(de); 1663 de = ext3_next_entry(de);
1654 } 1664 }
1655 return -ENOENT; 1665 return -ENOENT;
1656 } 1666 }
1657 1667
1658 static int ext3_add_nondir(handle_t *handle, 1668 static int ext3_add_nondir(handle_t *handle,
1659 struct dentry *dentry, struct 1669 struct dentry *dentry, struct inode *inode)
1660 { 1670 {
1661 int err = ext3_add_entry(handle, dent 1671 int err = ext3_add_entry(handle, dentry, inode);
1662 if (!err) { 1672 if (!err) {
1663 ext3_mark_inode_dirty(handle, 1673 ext3_mark_inode_dirty(handle, inode);
1664 d_instantiate(dentry, inode); 1674 d_instantiate(dentry, inode);
>> 1675 unlock_new_inode(inode);
1665 return 0; 1676 return 0;
1666 } 1677 }
1667 drop_nlink(inode); 1678 drop_nlink(inode);
>> 1679 unlock_new_inode(inode);
1668 iput(inode); 1680 iput(inode);
1669 return err; 1681 return err;
1670 } 1682 }
1671 1683
1672 /* 1684 /*
1673 * By the time this is called, we already hav 1685 * By the time this is called, we already have created
1674 * the directory cache entry for the new file 1686 * the directory cache entry for the new file, but it
1675 * is so far negative - it has no inode. 1687 * is so far negative - it has no inode.
1676 * 1688 *
1677 * If the create succeeds, we fill in the ino 1689 * If the create succeeds, we fill in the inode information
1678 * with d_instantiate(). 1690 * with d_instantiate().
1679 */ 1691 */
1680 static int ext3_create (struct inode * dir, s 1692 static int ext3_create (struct inode * dir, struct dentry * dentry, int mode,
1681 struct nameidata *nd) 1693 struct nameidata *nd)
1682 { 1694 {
1683 handle_t *handle; 1695 handle_t *handle;
1684 struct inode * inode; 1696 struct inode * inode;
1685 int err, retries = 0; 1697 int err, retries = 0;
1686 1698
1687 retry: 1699 retry:
1688 handle = ext3_journal_start(dir, EXT3 1700 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
1689 EXT3_ 1701 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
1690 2*EXT 1702 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
1691 if (IS_ERR(handle)) 1703 if (IS_ERR(handle))
1692 return PTR_ERR(handle); 1704 return PTR_ERR(handle);
1693 1705
1694 if (IS_DIRSYNC(dir)) 1706 if (IS_DIRSYNC(dir))
1695 handle->h_sync = 1; 1707 handle->h_sync = 1;
1696 1708
1697 inode = ext3_new_inode (handle, dir, 1709 inode = ext3_new_inode (handle, dir, mode);
1698 err = PTR_ERR(inode); 1710 err = PTR_ERR(inode);
1699 if (!IS_ERR(inode)) { 1711 if (!IS_ERR(inode)) {
1700 inode->i_op = &ext3_file_inod 1712 inode->i_op = &ext3_file_inode_operations;
1701 inode->i_fop = &ext3_file_ope 1713 inode->i_fop = &ext3_file_operations;
1702 ext3_set_aops(inode); 1714 ext3_set_aops(inode);
1703 err = ext3_add_nondir(handle, 1715 err = ext3_add_nondir(handle, dentry, inode);
1704 } 1716 }
1705 ext3_journal_stop(handle); 1717 ext3_journal_stop(handle);
1706 if (err == -ENOSPC && ext3_should_ret 1718 if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
1707 goto retry; 1719 goto retry;
1708 return err; 1720 return err;
1709 } 1721 }
1710 1722
1711 static int ext3_mknod (struct inode * dir, st 1723 static int ext3_mknod (struct inode * dir, struct dentry *dentry,
1712 int mode, dev_t rdev) 1724 int mode, dev_t rdev)
1713 { 1725 {
1714 handle_t *handle; 1726 handle_t *handle;
1715 struct inode *inode; 1727 struct inode *inode;
1716 int err, retries = 0; 1728 int err, retries = 0;
1717 1729
1718 if (!new_valid_dev(rdev)) 1730 if (!new_valid_dev(rdev))
1719 return -EINVAL; 1731 return -EINVAL;
1720 1732
1721 retry: 1733 retry:
1722 handle = ext3_journal_start(dir, EXT3 1734 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
1723 EXT3_ 1735 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
1724 2*EXT 1736 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
1725 if (IS_ERR(handle)) 1737 if (IS_ERR(handle))
1726 return PTR_ERR(handle); 1738 return PTR_ERR(handle);
1727 1739
1728 if (IS_DIRSYNC(dir)) 1740 if (IS_DIRSYNC(dir))
1729 handle->h_sync = 1; 1741 handle->h_sync = 1;
1730 1742
1731 inode = ext3_new_inode (handle, dir, 1743 inode = ext3_new_inode (handle, dir, mode);
1732 err = PTR_ERR(inode); 1744 err = PTR_ERR(inode);
1733 if (!IS_ERR(inode)) { 1745 if (!IS_ERR(inode)) {
1734 init_special_inode(inode, ino 1746 init_special_inode(inode, inode->i_mode, rdev);
1735 #ifdef CONFIG_EXT3_FS_XATTR 1747 #ifdef CONFIG_EXT3_FS_XATTR
1736 inode->i_op = &ext3_special_i 1748 inode->i_op = &ext3_special_inode_operations;
1737 #endif 1749 #endif
1738 err = ext3_add_nondir(handle, 1750 err = ext3_add_nondir(handle, dentry, inode);
1739 } 1751 }
1740 ext3_journal_stop(handle); 1752 ext3_journal_stop(handle);
1741 if (err == -ENOSPC && ext3_should_ret 1753 if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
1742 goto retry; 1754 goto retry;
1743 return err; 1755 return err;
1744 } 1756 }
1745 1757
1746 static int ext3_mkdir(struct inode * dir, str 1758 static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode)
1747 { 1759 {
1748 handle_t *handle; 1760 handle_t *handle;
1749 struct inode * inode; 1761 struct inode * inode;
1750 struct buffer_head * dir_block; 1762 struct buffer_head * dir_block;
1751 struct ext3_dir_entry_2 * de; 1763 struct ext3_dir_entry_2 * de;
1752 int err, retries = 0; 1764 int err, retries = 0;
1753 1765
1754 if (dir->i_nlink >= EXT3_LINK_MAX) 1766 if (dir->i_nlink >= EXT3_LINK_MAX)
1755 return -EMLINK; 1767 return -EMLINK;
1756 1768
1757 retry: 1769 retry:
1758 handle = ext3_journal_start(dir, EXT3 1770 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
1759 EXT3_ 1771 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
1760 2*EXT 1772 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
1761 if (IS_ERR(handle)) 1773 if (IS_ERR(handle))
1762 return PTR_ERR(handle); 1774 return PTR_ERR(handle);
1763 1775
1764 if (IS_DIRSYNC(dir)) 1776 if (IS_DIRSYNC(dir))
1765 handle->h_sync = 1; 1777 handle->h_sync = 1;
1766 1778
1767 inode = ext3_new_inode (handle, dir, 1779 inode = ext3_new_inode (handle, dir, S_IFDIR | mode);
1768 err = PTR_ERR(inode); 1780 err = PTR_ERR(inode);
1769 if (IS_ERR(inode)) 1781 if (IS_ERR(inode))
1770 goto out_stop; 1782 goto out_stop;
1771 1783
1772 inode->i_op = &ext3_dir_inode_operati 1784 inode->i_op = &ext3_dir_inode_operations;
1773 inode->i_fop = &ext3_dir_operations; 1785 inode->i_fop = &ext3_dir_operations;
1774 inode->i_size = EXT3_I(inode)->i_disk 1786 inode->i_size = EXT3_I(inode)->i_disksize = inode->i_sb->s_blocksize;
1775 dir_block = ext3_bread (handle, inode 1787 dir_block = ext3_bread (handle, inode, 0, 1, &err);
1776 if (!dir_block) { 1788 if (!dir_block) {
1777 drop_nlink(inode); /* is this 1789 drop_nlink(inode); /* is this nlink == 0? */
>> 1790 unlock_new_inode(inode);
1778 ext3_mark_inode_dirty(handle, 1791 ext3_mark_inode_dirty(handle, inode);
1779 iput (inode); 1792 iput (inode);
1780 goto out_stop; 1793 goto out_stop;
1781 } 1794 }
1782 BUFFER_TRACE(dir_block, "get_write_ac 1795 BUFFER_TRACE(dir_block, "get_write_access");
1783 ext3_journal_get_write_access(handle, 1796 ext3_journal_get_write_access(handle, dir_block);
1784 de = (struct ext3_dir_entry_2 *) dir_ 1797 de = (struct ext3_dir_entry_2 *) dir_block->b_data;
1785 de->inode = cpu_to_le32(inode->i_ino) 1798 de->inode = cpu_to_le32(inode->i_ino);
1786 de->name_len = 1; 1799 de->name_len = 1;
1787 de->rec_len = ext3_rec_len_to_disk(EX 1800 de->rec_len = ext3_rec_len_to_disk(EXT3_DIR_REC_LEN(de->name_len));
1788 strcpy (de->name, "."); 1801 strcpy (de->name, ".");
1789 ext3_set_de_type(dir->i_sb, de, S_IFD 1802 ext3_set_de_type(dir->i_sb, de, S_IFDIR);
1790 de = ext3_next_entry(de); 1803 de = ext3_next_entry(de);
1791 de->inode = cpu_to_le32(dir->i_ino); 1804 de->inode = cpu_to_le32(dir->i_ino);
1792 de->rec_len = ext3_rec_len_to_disk(in 1805 de->rec_len = ext3_rec_len_to_disk(inode->i_sb->s_blocksize -
1793 EXT3_ 1806 EXT3_DIR_REC_LEN(1));
1794 de->name_len = 2; 1807 de->name_len = 2;
1795 strcpy (de->name, ".."); 1808 strcpy (de->name, "..");
1796 ext3_set_de_type(dir->i_sb, de, S_IFD 1809 ext3_set_de_type(dir->i_sb, de, S_IFDIR);
1797 inode->i_nlink = 2; 1810 inode->i_nlink = 2;
1798 BUFFER_TRACE(dir_block, "call ext3_jo 1811 BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata");
1799 ext3_journal_dirty_metadata(handle, d 1812 ext3_journal_dirty_metadata(handle, dir_block);
1800 brelse (dir_block); 1813 brelse (dir_block);
1801 ext3_mark_inode_dirty(handle, inode); 1814 ext3_mark_inode_dirty(handle, inode);
1802 err = ext3_add_entry (handle, dentry, 1815 err = ext3_add_entry (handle, dentry, inode);
1803 if (err) { 1816 if (err) {
1804 inode->i_nlink = 0; 1817 inode->i_nlink = 0;
>> 1818 unlock_new_inode(inode);
1805 ext3_mark_inode_dirty(handle, 1819 ext3_mark_inode_dirty(handle, inode);
1806 iput (inode); 1820 iput (inode);
1807 goto out_stop; 1821 goto out_stop;
1808 } 1822 }
1809 inc_nlink(dir); 1823 inc_nlink(dir);
1810 ext3_update_dx_flag(dir); 1824 ext3_update_dx_flag(dir);
1811 ext3_mark_inode_dirty(handle, dir); 1825 ext3_mark_inode_dirty(handle, dir);
1812 d_instantiate(dentry, inode); 1826 d_instantiate(dentry, inode);
>> 1827 unlock_new_inode(inode);
1813 out_stop: 1828 out_stop:
1814 ext3_journal_stop(handle); 1829 ext3_journal_stop(handle);
1815 if (err == -ENOSPC && ext3_should_ret 1830 if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
1816 goto retry; 1831 goto retry;
1817 return err; 1832 return err;
1818 } 1833 }
1819 1834
1820 /* 1835 /*
1821 * routine to check that the specified direct 1836 * routine to check that the specified directory is empty (for rmdir)
1822 */ 1837 */
1823 static int empty_dir (struct inode * inode) 1838 static int empty_dir (struct inode * inode)
1824 { 1839 {
1825 unsigned long offset; 1840 unsigned long offset;
1826 struct buffer_head * bh; 1841 struct buffer_head * bh;
1827 struct ext3_dir_entry_2 * de, * de1; 1842 struct ext3_dir_entry_2 * de, * de1;
1828 struct super_block * sb; 1843 struct super_block * sb;
1829 int err = 0; 1844 int err = 0;
1830 1845
1831 sb = inode->i_sb; 1846 sb = inode->i_sb;
1832 if (inode->i_size < EXT3_DIR_REC_LEN( 1847 if (inode->i_size < EXT3_DIR_REC_LEN(1) + EXT3_DIR_REC_LEN(2) ||
1833 !(bh = ext3_bread (NULL, inode, 0 1848 !(bh = ext3_bread (NULL, inode, 0, 0, &err))) {
1834 if (err) 1849 if (err)
1835 ext3_error(inode->i_s !! 1850 ext3_error(inode->i_sb, __func__,
1836 "error %d 1851 "error %d reading directory #%lu offset 0",
1837 err, inode 1852 err, inode->i_ino);
1838 else 1853 else
1839 ext3_warning(inode->i !! 1854 ext3_warning(inode->i_sb, __func__,
1840 "bad dir 1855 "bad directory (dir #%lu) - no data block",
1841 inode->i 1856 inode->i_ino);
1842 return 1; 1857 return 1;
1843 } 1858 }
1844 de = (struct ext3_dir_entry_2 *) bh-> 1859 de = (struct ext3_dir_entry_2 *) bh->b_data;
1845 de1 = ext3_next_entry(de); 1860 de1 = ext3_next_entry(de);
1846 if (le32_to_cpu(de->inode) != inode-> 1861 if (le32_to_cpu(de->inode) != inode->i_ino ||
1847 !le32_to_cpu(de1->ino 1862 !le32_to_cpu(de1->inode) ||
1848 strcmp (".", de->name 1863 strcmp (".", de->name) ||
1849 strcmp ("..", de1->na 1864 strcmp ("..", de1->name)) {
1850 ext3_warning (inode->i_sb, "e 1865 ext3_warning (inode->i_sb, "empty_dir",
1851 "bad directory 1866 "bad directory (dir #%lu) - no `.' or `..'",
1852 inode->i_ino); 1867 inode->i_ino);
1853 brelse (bh); 1868 brelse (bh);
1854 return 1; 1869 return 1;
1855 } 1870 }
1856 offset = ext3_rec_len_from_disk(de->r 1871 offset = ext3_rec_len_from_disk(de->rec_len) +
1857 ext3_rec_len_from_dis 1872 ext3_rec_len_from_disk(de1->rec_len);
1858 de = ext3_next_entry(de1); 1873 de = ext3_next_entry(de1);
1859 while (offset < inode->i_size ) { 1874 while (offset < inode->i_size ) {
1860 if (!bh || 1875 if (!bh ||
1861 (void *) de >= (void 1876 (void *) de >= (void *) (bh->b_data+sb->s_blocksize)) {
1862 err = 0; 1877 err = 0;
1863 brelse (bh); 1878 brelse (bh);
1864 bh = ext3_bread (NULL 1879 bh = ext3_bread (NULL, inode,
1865 offset >> EXT 1880 offset >> EXT3_BLOCK_SIZE_BITS(sb), 0, &err);
1866 if (!bh) { 1881 if (!bh) {
1867 if (err) 1882 if (err)
1868 ext3_ !! 1883 ext3_error(sb, __func__,
1869 1884 "error %d reading directory"
1870 1885 " #%lu offset %lu",
1871 1886 err, inode->i_ino, offset);
1872 offset += sb- 1887 offset += sb->s_blocksize;
1873 continue; 1888 continue;
1874 } 1889 }
1875 de = (struct ext3_dir 1890 de = (struct ext3_dir_entry_2 *) bh->b_data;
1876 } 1891 }
1877 if (!ext3_check_dir_entry("em 1892 if (!ext3_check_dir_entry("empty_dir", inode, de, bh, offset)) {
1878 de = (struct ext3_dir 1893 de = (struct ext3_dir_entry_2 *)(bh->b_data +
1879 1894 sb->s_blocksize);
1880 offset = (offset | (s 1895 offset = (offset | (sb->s_blocksize - 1)) + 1;
1881 continue; 1896 continue;
1882 } 1897 }
1883 if (le32_to_cpu(de->inode)) { 1898 if (le32_to_cpu(de->inode)) {
1884 brelse (bh); 1899 brelse (bh);
1885 return 0; 1900 return 0;
1886 } 1901 }
1887 offset += ext3_rec_len_from_d 1902 offset += ext3_rec_len_from_disk(de->rec_len);
1888 de = ext3_next_entry(de); 1903 de = ext3_next_entry(de);
1889 } 1904 }
1890 brelse (bh); 1905 brelse (bh);
1891 return 1; 1906 return 1;
1892 } 1907 }
1893 1908
1894 /* ext3_orphan_add() links an unlinked or tru 1909 /* ext3_orphan_add() links an unlinked or truncated inode into a list of
1895 * such inodes, starting at the superblock, i 1910 * such inodes, starting at the superblock, in case we crash before the
1896 * file is closed/deleted, or in case the ino 1911 * file is closed/deleted, or in case the inode truncate spans multiple
1897 * transactions and the last transaction is n 1912 * transactions and the last transaction is not recovered after a crash.
1898 * 1913 *
1899 * At filesystem recovery time, we walk this 1914 * At filesystem recovery time, we walk this list deleting unlinked
1900 * inodes and truncating linked inodes in ext 1915 * inodes and truncating linked inodes in ext3_orphan_cleanup().
1901 */ 1916 */
1902 int ext3_orphan_add(handle_t *handle, struct 1917 int ext3_orphan_add(handle_t *handle, struct inode *inode)
1903 { 1918 {
1904 struct super_block *sb = inode->i_sb; 1919 struct super_block *sb = inode->i_sb;
1905 struct ext3_iloc iloc; 1920 struct ext3_iloc iloc;
1906 int err = 0, rc; 1921 int err = 0, rc;
1907 1922
1908 lock_super(sb); 1923 lock_super(sb);
1909 if (!list_empty(&EXT3_I(inode)->i_orp 1924 if (!list_empty(&EXT3_I(inode)->i_orphan))
1910 goto out_unlock; 1925 goto out_unlock;
1911 1926
1912 /* Orphan handling is only valid for 1927 /* Orphan handling is only valid for files with data blocks
1913 * being truncated, or files being un 1928 * being truncated, or files being unlinked. */
1914 1929
1915 /* @@@ FIXME: Observation from aviro: 1930 /* @@@ FIXME: Observation from aviro:
1916 * I think I can trigger J_ASSERT in 1931 * I think I can trigger J_ASSERT in ext3_orphan_add(). We block
1917 * here (on lock_super()), so race wi 1932 * here (on lock_super()), so race with ext3_link() which might bump
1918 * ->i_nlink. For, say it, character 1933 * ->i_nlink. For, say it, character device. Not a regular file,
1919 * not a directory, not a symlink and 1934 * not a directory, not a symlink and ->i_nlink > 0.
1920 */ 1935 */
1921 J_ASSERT ((S_ISREG(inode->i_mode) || 1936 J_ASSERT ((S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
1922 S_ISLNK(inode->i_mode)) || in 1937 S_ISLNK(inode->i_mode)) || inode->i_nlink == 0);
1923 1938
1924 BUFFER_TRACE(EXT3_SB(sb)->s_sbh, "get 1939 BUFFER_TRACE(EXT3_SB(sb)->s_sbh, "get_write_access");
1925 err = ext3_journal_get_write_access(h 1940 err = ext3_journal_get_write_access(handle, EXT3_SB(sb)->s_sbh);
1926 if (err) 1941 if (err)
1927 goto out_unlock; 1942 goto out_unlock;
1928 1943
1929 err = ext3_reserve_inode_write(handle 1944 err = ext3_reserve_inode_write(handle, inode, &iloc);
1930 if (err) 1945 if (err)
1931 goto out_unlock; 1946 goto out_unlock;
1932 1947
1933 /* Insert this inode at the head of t 1948 /* Insert this inode at the head of the on-disk orphan list... */
1934 NEXT_ORPHAN(inode) = le32_to_cpu(EXT3 1949 NEXT_ORPHAN(inode) = le32_to_cpu(EXT3_SB(sb)->s_es->s_last_orphan);
1935 EXT3_SB(sb)->s_es->s_last_orphan = cp 1950 EXT3_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino);
1936 err = ext3_journal_dirty_metadata(han 1951 err = ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
1937 rc = ext3_mark_iloc_dirty(handle, ino 1952 rc = ext3_mark_iloc_dirty(handle, inode, &iloc);
1938 if (!err) 1953 if (!err)
1939 err = rc; 1954 err = rc;
1940 1955
1941 /* Only add to the head of the in-mem 1956 /* Only add to the head of the in-memory list if all the
1942 * previous operations succeeded. If 1957 * previous operations succeeded. If the orphan_add is going to
1943 * fail (possibly taking the journal 1958 * fail (possibly taking the journal offline), we can't risk
1944 * leaving the inode on the orphan li 1959 * leaving the inode on the orphan list: stray orphan-list
1945 * entries can cause panics at unmoun 1960 * entries can cause panics at unmount time.
1946 * 1961 *
1947 * This is safe: on error we're going 1962 * This is safe: on error we're going to ignore the orphan list
1948 * anyway on the next recovery. */ 1963 * anyway on the next recovery. */
1949 if (!err) 1964 if (!err)
1950 list_add(&EXT3_I(inode)->i_or 1965 list_add(&EXT3_I(inode)->i_orphan, &EXT3_SB(sb)->s_orphan);
1951 1966
1952 jbd_debug(4, "superblock will point t 1967 jbd_debug(4, "superblock will point to %lu\n", inode->i_ino);
1953 jbd_debug(4, "orphan inode %lu will p 1968 jbd_debug(4, "orphan inode %lu will point to %d\n",
1954 inode->i_ino, NEXT_OR 1969 inode->i_ino, NEXT_ORPHAN(inode));
1955 out_unlock: 1970 out_unlock:
1956 unlock_super(sb); 1971 unlock_super(sb);
1957 ext3_std_error(inode->i_sb, err); 1972 ext3_std_error(inode->i_sb, err);
1958 return err; 1973 return err;
1959 } 1974 }
1960 1975
1961 /* 1976 /*
1962 * ext3_orphan_del() removes an unlinked or t 1977 * ext3_orphan_del() removes an unlinked or truncated inode from the list
1963 * of such inodes stored on disk, because it 1978 * of such inodes stored on disk, because it is finally being cleaned up.
1964 */ 1979 */
1965 int ext3_orphan_del(handle_t *handle, struct 1980 int ext3_orphan_del(handle_t *handle, struct inode *inode)
1966 { 1981 {
1967 struct list_head *prev; 1982 struct list_head *prev;
1968 struct ext3_inode_info *ei = EXT3_I(i 1983 struct ext3_inode_info *ei = EXT3_I(inode);
1969 struct ext3_sb_info *sbi; 1984 struct ext3_sb_info *sbi;
1970 unsigned long ino_next; 1985 unsigned long ino_next;
1971 struct ext3_iloc iloc; 1986 struct ext3_iloc iloc;
1972 int err = 0; 1987 int err = 0;
1973 1988
1974 lock_super(inode->i_sb); 1989 lock_super(inode->i_sb);
1975 if (list_empty(&ei->i_orphan)) { 1990 if (list_empty(&ei->i_orphan)) {
1976 unlock_super(inode->i_sb); 1991 unlock_super(inode->i_sb);
1977 return 0; 1992 return 0;
1978 } 1993 }
1979 1994
1980 ino_next = NEXT_ORPHAN(inode); 1995 ino_next = NEXT_ORPHAN(inode);
1981 prev = ei->i_orphan.prev; 1996 prev = ei->i_orphan.prev;
1982 sbi = EXT3_SB(inode->i_sb); 1997 sbi = EXT3_SB(inode->i_sb);
1983 1998
1984 jbd_debug(4, "remove inode %lu from o 1999 jbd_debug(4, "remove inode %lu from orphan list\n", inode->i_ino);
1985 2000
1986 list_del_init(&ei->i_orphan); 2001 list_del_init(&ei->i_orphan);
1987 2002
1988 /* If we're on an error path, we may 2003 /* If we're on an error path, we may not have a valid
1989 * transaction handle with which to u 2004 * transaction handle with which to update the orphan list on
1990 * disk, but we still need to remove 2005 * disk, but we still need to remove the inode from the linked
1991 * list in memory. */ 2006 * list in memory. */
1992 if (!handle) 2007 if (!handle)
1993 goto out; 2008 goto out;
1994 2009
1995 err = ext3_reserve_inode_write(handle 2010 err = ext3_reserve_inode_write(handle, inode, &iloc);
1996 if (err) 2011 if (err)
1997 goto out_err; 2012 goto out_err;
1998 2013
1999 if (prev == &sbi->s_orphan) { 2014 if (prev == &sbi->s_orphan) {
2000 jbd_debug(4, "superblock will 2015 jbd_debug(4, "superblock will point to %lu\n", ino_next);
2001 BUFFER_TRACE(sbi->s_sbh, "get 2016 BUFFER_TRACE(sbi->s_sbh, "get_write_access");
2002 err = ext3_journal_get_write_ 2017 err = ext3_journal_get_write_access(handle, sbi->s_sbh);
2003 if (err) 2018 if (err)
2004 goto out_brelse; 2019 goto out_brelse;
2005 sbi->s_es->s_last_orphan = cp 2020 sbi->s_es->s_last_orphan = cpu_to_le32(ino_next);
2006 err = ext3_journal_dirty_meta 2021 err = ext3_journal_dirty_metadata(handle, sbi->s_sbh);
2007 } else { 2022 } else {
2008 struct ext3_iloc iloc2; 2023 struct ext3_iloc iloc2;
2009 struct inode *i_prev = 2024 struct inode *i_prev =
2010 &list_entry(prev, str 2025 &list_entry(prev, struct ext3_inode_info, i_orphan)->vfs_inode;
2011 2026
2012 jbd_debug(4, "orphan inode %l 2027 jbd_debug(4, "orphan inode %lu will point to %lu\n",
2013 i_prev->i_ino, ino_ 2028 i_prev->i_ino, ino_next);
2014 err = ext3_reserve_inode_writ 2029 err = ext3_reserve_inode_write(handle, i_prev, &iloc2);
2015 if (err) 2030 if (err)
2016 goto out_brelse; 2031 goto out_brelse;
2017 NEXT_ORPHAN(i_prev) = ino_nex 2032 NEXT_ORPHAN(i_prev) = ino_next;
2018 err = ext3_mark_iloc_dirty(ha 2033 err = ext3_mark_iloc_dirty(handle, i_prev, &iloc2);
2019 } 2034 }
2020 if (err) 2035 if (err)
2021 goto out_brelse; 2036 goto out_brelse;
2022 NEXT_ORPHAN(inode) = 0; 2037 NEXT_ORPHAN(inode) = 0;
2023 err = ext3_mark_iloc_dirty(handle, in 2038 err = ext3_mark_iloc_dirty(handle, inode, &iloc);
2024 2039
2025 out_err: 2040 out_err:
2026 ext3_std_error(inode->i_sb, err); 2041 ext3_std_error(inode->i_sb, err);
2027 out: 2042 out:
2028 unlock_super(inode->i_sb); 2043 unlock_super(inode->i_sb);
2029 return err; 2044 return err;
2030 2045
2031 out_brelse: 2046 out_brelse:
2032 brelse(iloc.bh); 2047 brelse(iloc.bh);
2033 goto out_err; 2048 goto out_err;
2034 } 2049 }
2035 2050
2036 static int ext3_rmdir (struct inode * dir, st 2051 static int ext3_rmdir (struct inode * dir, struct dentry *dentry)
2037 { 2052 {
2038 int retval; 2053 int retval;
2039 struct inode * inode; 2054 struct inode * inode;
2040 struct buffer_head * bh; 2055 struct buffer_head * bh;
2041 struct ext3_dir_entry_2 * de; 2056 struct ext3_dir_entry_2 * de;
2042 handle_t *handle; 2057 handle_t *handle;
2043 2058
2044 /* Initialize quotas before so that e 2059 /* Initialize quotas before so that eventual writes go in
2045 * separate transaction */ 2060 * separate transaction */
2046 DQUOT_INIT(dentry->d_inode); !! 2061 vfs_dq_init(dentry->d_inode);
2047 handle = ext3_journal_start(dir, EXT3 2062 handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb));
2048 if (IS_ERR(handle)) 2063 if (IS_ERR(handle))
2049 return PTR_ERR(handle); 2064 return PTR_ERR(handle);
2050 2065
2051 retval = -ENOENT; 2066 retval = -ENOENT;
2052 bh = ext3_find_entry (dentry, &de); !! 2067 bh = ext3_find_entry(dir, &dentry->d_name, &de);
2053 if (!bh) 2068 if (!bh)
2054 goto end_rmdir; 2069 goto end_rmdir;
2055 2070
2056 if (IS_DIRSYNC(dir)) 2071 if (IS_DIRSYNC(dir))
2057 handle->h_sync = 1; 2072 handle->h_sync = 1;
2058 2073
2059 inode = dentry->d_inode; 2074 inode = dentry->d_inode;
2060 2075
2061 retval = -EIO; 2076 retval = -EIO;
2062 if (le32_to_cpu(de->inode) != inode-> 2077 if (le32_to_cpu(de->inode) != inode->i_ino)
2063 goto end_rmdir; 2078 goto end_rmdir;
2064 2079
2065 retval = -ENOTEMPTY; 2080 retval = -ENOTEMPTY;
2066 if (!empty_dir (inode)) 2081 if (!empty_dir (inode))
2067 goto end_rmdir; 2082 goto end_rmdir;
2068 2083
2069 retval = ext3_delete_entry(handle, di 2084 retval = ext3_delete_entry(handle, dir, de, bh);
2070 if (retval) 2085 if (retval)
2071 goto end_rmdir; 2086 goto end_rmdir;
2072 if (inode->i_nlink != 2) 2087 if (inode->i_nlink != 2)
2073 ext3_warning (inode->i_sb, "e 2088 ext3_warning (inode->i_sb, "ext3_rmdir",
2074 "empty director 2089 "empty directory has nlink!=2 (%d)",
2075 inode->i_nlink) 2090 inode->i_nlink);
2076 inode->i_version++; 2091 inode->i_version++;
2077 clear_nlink(inode); 2092 clear_nlink(inode);
2078 /* There's no need to set i_disksize: 2093 /* There's no need to set i_disksize: the fact that i_nlink is
2079 * zero will ensure that the right th 2094 * zero will ensure that the right thing happens during any
2080 * recovery. */ 2095 * recovery. */
2081 inode->i_size = 0; 2096 inode->i_size = 0;
2082 ext3_orphan_add(handle, inode); 2097 ext3_orphan_add(handle, inode);
2083 inode->i_ctime = dir->i_ctime = dir-> 2098 inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
2084 ext3_mark_inode_dirty(handle, inode); 2099 ext3_mark_inode_dirty(handle, inode);
2085 drop_nlink(dir); 2100 drop_nlink(dir);
2086 ext3_update_dx_flag(dir); 2101 ext3_update_dx_flag(dir);
2087 ext3_mark_inode_dirty(handle, dir); 2102 ext3_mark_inode_dirty(handle, dir);
2088 2103
2089 end_rmdir: 2104 end_rmdir:
2090 ext3_journal_stop(handle); 2105 ext3_journal_stop(handle);
2091 brelse (bh); 2106 brelse (bh);
2092 return retval; 2107 return retval;
2093 } 2108 }
2094 2109
2095 static int ext3_unlink(struct inode * dir, st 2110 static int ext3_unlink(struct inode * dir, struct dentry *dentry)
2096 { 2111 {
2097 int retval; 2112 int retval;
2098 struct inode * inode; 2113 struct inode * inode;
2099 struct buffer_head * bh; 2114 struct buffer_head * bh;
2100 struct ext3_dir_entry_2 * de; 2115 struct ext3_dir_entry_2 * de;
2101 handle_t *handle; 2116 handle_t *handle;
2102 2117
2103 /* Initialize quotas before so that e 2118 /* Initialize quotas before so that eventual writes go
2104 * in separate transaction */ 2119 * in separate transaction */
2105 DQUOT_INIT(dentry->d_inode); !! 2120 vfs_dq_init(dentry->d_inode);
2106 handle = ext3_journal_start(dir, EXT3 2121 handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb));
2107 if (IS_ERR(handle)) 2122 if (IS_ERR(handle))
2108 return PTR_ERR(handle); 2123 return PTR_ERR(handle);
2109 2124
2110 if (IS_DIRSYNC(dir)) 2125 if (IS_DIRSYNC(dir))
2111 handle->h_sync = 1; 2126 handle->h_sync = 1;
2112 2127
2113 retval = -ENOENT; 2128 retval = -ENOENT;
2114 bh = ext3_find_entry (dentry, &de); !! 2129 bh = ext3_find_entry(dir, &dentry->d_name, &de);
2115 if (!bh) 2130 if (!bh)
2116 goto end_unlink; 2131 goto end_unlink;
2117 2132
2118 inode = dentry->d_inode; 2133 inode = dentry->d_inode;
2119 2134
2120 retval = -EIO; 2135 retval = -EIO;
2121 if (le32_to_cpu(de->inode) != inode-> 2136 if (le32_to_cpu(de->inode) != inode->i_ino)
2122 goto end_unlink; 2137 goto end_unlink;
2123 2138
2124 if (!inode->i_nlink) { 2139 if (!inode->i_nlink) {
2125 ext3_warning (inode->i_sb, "e 2140 ext3_warning (inode->i_sb, "ext3_unlink",
2126 "Deleting nonex 2141 "Deleting nonexistent file (%lu), %d",
2127 inode->i_ino, i 2142 inode->i_ino, inode->i_nlink);
2128 inode->i_nlink = 1; 2143 inode->i_nlink = 1;
2129 } 2144 }
2130 retval = ext3_delete_entry(handle, di 2145 retval = ext3_delete_entry(handle, dir, de, bh);
2131 if (retval) 2146 if (retval)
2132 goto end_unlink; 2147 goto end_unlink;
2133 dir->i_ctime = dir->i_mtime = CURRENT 2148 dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
2134 ext3_update_dx_flag(dir); 2149 ext3_update_dx_flag(dir);
2135 ext3_mark_inode_dirty(handle, dir); 2150 ext3_mark_inode_dirty(handle, dir);
2136 drop_nlink(inode); 2151 drop_nlink(inode);
2137 if (!inode->i_nlink) 2152 if (!inode->i_nlink)
2138 ext3_orphan_add(handle, inode 2153 ext3_orphan_add(handle, inode);
2139 inode->i_ctime = dir->i_ctime; 2154 inode->i_ctime = dir->i_ctime;
2140 ext3_mark_inode_dirty(handle, inode); 2155 ext3_mark_inode_dirty(handle, inode);
2141 retval = 0; 2156 retval = 0;
2142 2157
2143 end_unlink: 2158 end_unlink:
2144 ext3_journal_stop(handle); 2159 ext3_journal_stop(handle);
2145 brelse (bh); 2160 brelse (bh);
2146 return retval; 2161 return retval;
2147 } 2162 }
2148 2163
2149 static int ext3_symlink (struct inode * dir, 2164 static int ext3_symlink (struct inode * dir,
2150 struct dentry *dentry, const 2165 struct dentry *dentry, const char * symname)
2151 { 2166 {
2152 handle_t *handle; 2167 handle_t *handle;
2153 struct inode * inode; 2168 struct inode * inode;
2154 int l, err, retries = 0; 2169 int l, err, retries = 0;
2155 2170
2156 l = strlen(symname)+1; 2171 l = strlen(symname)+1;
2157 if (l > dir->i_sb->s_blocksize) 2172 if (l > dir->i_sb->s_blocksize)
2158 return -ENAMETOOLONG; 2173 return -ENAMETOOLONG;
2159 2174
2160 retry: 2175 retry:
2161 handle = ext3_journal_start(dir, EXT3 2176 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
2162 EXT3_ 2177 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 +
2163 2*EXT 2178 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
2164 if (IS_ERR(handle)) 2179 if (IS_ERR(handle))
2165 return PTR_ERR(handle); 2180 return PTR_ERR(handle);
2166 2181
2167 if (IS_DIRSYNC(dir)) 2182 if (IS_DIRSYNC(dir))
2168 handle->h_sync = 1; 2183 handle->h_sync = 1;
2169 2184
2170 inode = ext3_new_inode (handle, dir, 2185 inode = ext3_new_inode (handle, dir, S_IFLNK|S_IRWXUGO);
2171 err = PTR_ERR(inode); 2186 err = PTR_ERR(inode);
2172 if (IS_ERR(inode)) 2187 if (IS_ERR(inode))
2173 goto out_stop; 2188 goto out_stop;
2174 2189
2175 if (l > sizeof (EXT3_I(inode)->i_data 2190 if (l > sizeof (EXT3_I(inode)->i_data)) {
2176 inode->i_op = &ext3_symlink_i 2191 inode->i_op = &ext3_symlink_inode_operations;
2177 ext3_set_aops(inode); 2192 ext3_set_aops(inode);
2178 /* 2193 /*
2179 * page_symlink() calls into 2194 * page_symlink() calls into ext3_prepare/commit_write.
2180 * We have a transaction open 2195 * We have a transaction open. All is sweetness. It also sets
2181 * i_size in generic_commit_w 2196 * i_size in generic_commit_write().
2182 */ 2197 */
2183 err = __page_symlink(inode, s !! 2198 err = __page_symlink(inode, symname, l, 1);
2184 mapping_gfp_m <<
2185 if (err) { 2199 if (err) {
2186 drop_nlink(inode); 2200 drop_nlink(inode);
>> 2201 unlock_new_inode(inode);
2187 ext3_mark_inode_dirty 2202 ext3_mark_inode_dirty(handle, inode);
2188 iput (inode); 2203 iput (inode);
2189 goto out_stop; 2204 goto out_stop;
2190 } 2205 }
2191 } else { 2206 } else {
2192 inode->i_op = &ext3_fast_syml 2207 inode->i_op = &ext3_fast_symlink_inode_operations;
2193 memcpy((char*)&EXT3_I(inode)- 2208 memcpy((char*)&EXT3_I(inode)->i_data,symname,l);
2194 inode->i_size = l-1; 2209 inode->i_size = l-1;
2195 } 2210 }
2196 EXT3_I(inode)->i_disksize = inode->i_ 2211 EXT3_I(inode)->i_disksize = inode->i_size;
2197 err = ext3_add_nondir(handle, dentry, 2212 err = ext3_add_nondir(handle, dentry, inode);
2198 out_stop: 2213 out_stop:
2199 ext3_journal_stop(handle); 2214 ext3_journal_stop(handle);
2200 if (err == -ENOSPC && ext3_should_ret 2215 if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
2201 goto retry; 2216 goto retry;
2202 return err; 2217 return err;
2203 } 2218 }
2204 2219
2205 static int ext3_link (struct dentry * old_den 2220 static int ext3_link (struct dentry * old_dentry,
2206 struct inode * dir, struct de 2221 struct inode * dir, struct dentry *dentry)
2207 { 2222 {
2208 handle_t *handle; 2223 handle_t *handle;
2209 struct inode *inode = old_dentry->d_i 2224 struct inode *inode = old_dentry->d_inode;
2210 int err, retries = 0; 2225 int err, retries = 0;
2211 2226
2212 if (inode->i_nlink >= EXT3_LINK_MAX) 2227 if (inode->i_nlink >= EXT3_LINK_MAX)
2213 return -EMLINK; 2228 return -EMLINK;
2214 /* 2229 /*
2215 * Return -ENOENT if we've raced with 2230 * Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing
2216 * otherwise has the potential to cor 2231 * otherwise has the potential to corrupt the orphan inode list.
2217 */ 2232 */
2218 if (inode->i_nlink == 0) 2233 if (inode->i_nlink == 0)
2219 return -ENOENT; 2234 return -ENOENT;
2220 2235
2221 retry: 2236 retry:
2222 handle = ext3_journal_start(dir, EXT3 2237 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
2223 EXT3_ 2238 EXT3_INDEX_EXTRA_TRANS_BLOCKS);
2224 if (IS_ERR(handle)) 2239 if (IS_ERR(handle))
2225 return PTR_ERR(handle); 2240 return PTR_ERR(handle);
2226 2241
2227 if (IS_DIRSYNC(dir)) 2242 if (IS_DIRSYNC(dir))
2228 handle->h_sync = 1; 2243 handle->h_sync = 1;
2229 2244
2230 inode->i_ctime = CURRENT_TIME_SEC; 2245 inode->i_ctime = CURRENT_TIME_SEC;
2231 inc_nlink(inode); 2246 inc_nlink(inode);
2232 atomic_inc(&inode->i_count); 2247 atomic_inc(&inode->i_count);
2233 2248
2234 err = ext3_add_nondir(handle, dentry, !! 2249 err = ext3_add_entry(handle, dentry, inode);
>> 2250 if (!err) {
>> 2251 ext3_mark_inode_dirty(handle, inode);
>> 2252 d_instantiate(dentry, inode);
>> 2253 } else {
>> 2254 drop_nlink(inode);
>> 2255 iput(inode);
>> 2256 }
2235 ext3_journal_stop(handle); 2257 ext3_journal_stop(handle);
2236 if (err == -ENOSPC && ext3_should_ret 2258 if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
2237 goto retry; 2259 goto retry;
2238 return err; 2260 return err;
2239 } 2261 }
2240 2262
2241 #define PARENT_INO(buffer) \ 2263 #define PARENT_INO(buffer) \
2242 (ext3_next_entry((struct ext3_dir_ent 2264 (ext3_next_entry((struct ext3_dir_entry_2 *)(buffer))->inode)
2243 2265
2244 /* 2266 /*
2245 * Anybody can rename anything with this: the 2267 * Anybody can rename anything with this: the permission checks are left to the
2246 * higher-level routines. 2268 * higher-level routines.
2247 */ 2269 */
2248 static int ext3_rename (struct inode * old_di 2270 static int ext3_rename (struct inode * old_dir, struct dentry *old_dentry,
2249 struct inode * new 2271 struct inode * new_dir,struct dentry *new_dentry)
2250 { 2272 {
2251 handle_t *handle; 2273 handle_t *handle;
2252 struct inode * old_inode, * new_inode 2274 struct inode * old_inode, * new_inode;
2253 struct buffer_head * old_bh, * new_bh 2275 struct buffer_head * old_bh, * new_bh, * dir_bh;
2254 struct ext3_dir_entry_2 * old_de, * n 2276 struct ext3_dir_entry_2 * old_de, * new_de;
2255 int retval; !! 2277 int retval, flush_file = 0;
2256 2278
2257 old_bh = new_bh = dir_bh = NULL; 2279 old_bh = new_bh = dir_bh = NULL;
2258 2280
2259 /* Initialize quotas before so that e 2281 /* Initialize quotas before so that eventual writes go
2260 * in separate transaction */ 2282 * in separate transaction */
2261 if (new_dentry->d_inode) 2283 if (new_dentry->d_inode)
2262 DQUOT_INIT(new_dentry->d_inod !! 2284 vfs_dq_init(new_dentry->d_inode);
2263 handle = ext3_journal_start(old_dir, 2285 handle = ext3_journal_start(old_dir, 2 *
2264 EXT3_ 2286 EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) +
2265 EXT3_ 2287 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2);
2266 if (IS_ERR(handle)) 2288 if (IS_ERR(handle))
2267 return PTR_ERR(handle); 2289 return PTR_ERR(handle);
2268 2290
2269 if (IS_DIRSYNC(old_dir) || IS_DIRSYNC 2291 if (IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir))
2270 handle->h_sync = 1; 2292 handle->h_sync = 1;
2271 2293
2272 old_bh = ext3_find_entry (old_dentry, !! 2294 old_bh = ext3_find_entry(old_dir, &old_dentry->d_name, &old_de);
2273 /* 2295 /*
2274 * Check for inode number is _not_ d 2296 * Check for inode number is _not_ due to possible IO errors.
2275 * We might rmdir the source, keep i 2297 * We might rmdir the source, keep it as pwd of some process
2276 * and merrily kill the link to what 2298 * and merrily kill the link to whatever was created under the
2277 * same name. Goodbye sticky bit ;-< 2299 * same name. Goodbye sticky bit ;-<
2278 */ 2300 */
2279 old_inode = old_dentry->d_inode; 2301 old_inode = old_dentry->d_inode;
2280 retval = -ENOENT; 2302 retval = -ENOENT;
2281 if (!old_bh || le32_to_cpu(old_de->in 2303 if (!old_bh || le32_to_cpu(old_de->inode) != old_inode->i_ino)
2282 goto end_rename; 2304 goto end_rename;
2283 2305
2284 new_inode = new_dentry->d_inode; 2306 new_inode = new_dentry->d_inode;
2285 new_bh = ext3_find_entry (new_dentry, !! 2307 new_bh = ext3_find_entry(new_dir, &new_dentry->d_name, &new_de);
2286 if (new_bh) { 2308 if (new_bh) {
2287 if (!new_inode) { 2309 if (!new_inode) {
2288 brelse (new_bh); 2310 brelse (new_bh);
2289 new_bh = NULL; 2311 new_bh = NULL;
2290 } 2312 }
2291 } 2313 }
2292 if (S_ISDIR(old_inode->i_mode)) { 2314 if (S_ISDIR(old_inode->i_mode)) {
2293 if (new_inode) { 2315 if (new_inode) {
2294 retval = -ENOTEMPTY; 2316 retval = -ENOTEMPTY;
2295 if (!empty_dir (new_i 2317 if (!empty_dir (new_inode))
2296 goto end_rena 2318 goto end_rename;
2297 } 2319 }
2298 retval = -EIO; 2320 retval = -EIO;
2299 dir_bh = ext3_bread (handle, 2321 dir_bh = ext3_bread (handle, old_inode, 0, 0, &retval);
2300 if (!dir_bh) 2322 if (!dir_bh)
2301 goto end_rename; 2323 goto end_rename;
2302 if (le32_to_cpu(PARENT_INO(di 2324 if (le32_to_cpu(PARENT_INO(dir_bh->b_data)) != old_dir->i_ino)
2303 goto end_rename; 2325 goto end_rename;
2304 retval = -EMLINK; 2326 retval = -EMLINK;
2305 if (!new_inode && new_dir!=ol 2327 if (!new_inode && new_dir!=old_dir &&
2306 new_dir->i_nl 2328 new_dir->i_nlink >= EXT3_LINK_MAX)
2307 goto end_rename; 2329 goto end_rename;
2308 } 2330 }
2309 if (!new_bh) { 2331 if (!new_bh) {
2310 retval = ext3_add_entry (hand 2332 retval = ext3_add_entry (handle, new_dentry, old_inode);
2311 if (retval) 2333 if (retval)
2312 goto end_rename; 2334 goto end_rename;
2313 } else { 2335 } else {
2314 BUFFER_TRACE(new_bh, "get wri 2336 BUFFER_TRACE(new_bh, "get write access");
2315 ext3_journal_get_write_access 2337 ext3_journal_get_write_access(handle, new_bh);
2316 new_de->inode = cpu_to_le32(o 2338 new_de->inode = cpu_to_le32(old_inode->i_ino);
2317 if (EXT3_HAS_INCOMPAT_FEATURE 2339 if (EXT3_HAS_INCOMPAT_FEATURE(new_dir->i_sb,
2318 2340 EXT3_FEATURE_INCOMPAT_FILETYPE))
2319 new_de->file_type = o 2341 new_de->file_type = old_de->file_type;
2320 new_dir->i_version++; 2342 new_dir->i_version++;
>> 2343 new_dir->i_ctime = new_dir->i_mtime = CURRENT_TIME_SEC;
>> 2344 ext3_mark_inode_dirty(handle, new_dir);
2321 BUFFER_TRACE(new_bh, "call ex 2345 BUFFER_TRACE(new_bh, "call ext3_journal_dirty_metadata");
2322 ext3_journal_dirty_metadata(h 2346 ext3_journal_dirty_metadata(handle, new_bh);
2323 brelse(new_bh); 2347 brelse(new_bh);
2324 new_bh = NULL; 2348 new_bh = NULL;
2325 } 2349 }
2326 2350
2327 /* 2351 /*
2328 * Like most other Unix systems, set 2352 * Like most other Unix systems, set the ctime for inodes on a
2329 * rename. 2353 * rename.
2330 */ 2354 */
2331 old_inode->i_ctime = CURRENT_TIME_SEC 2355 old_inode->i_ctime = CURRENT_TIME_SEC;
2332 ext3_mark_inode_dirty(handle, old_ino 2356 ext3_mark_inode_dirty(handle, old_inode);
2333 2357
2334 /* 2358 /*
2335 * ok, that's it 2359 * ok, that's it
2336 */ 2360 */
2337 if (le32_to_cpu(old_de->inode) != old 2361 if (le32_to_cpu(old_de->inode) != old_inode->i_ino ||
2338 old_de->name_len != old_dentry->d 2362 old_de->name_len != old_dentry->d_name.len ||
2339 strncmp(old_de->name, old_dentry- 2363 strncmp(old_de->name, old_dentry->d_name.name, old_de->name_len) ||
2340 (retval = ext3_delete_entry(handl 2364 (retval = ext3_delete_entry(handle, old_dir,
2341 old_d 2365 old_de, old_bh)) == -ENOENT) {
2342 /* old_de could have moved fr 2366 /* old_de could have moved from under us during htree split, so
2343 * make sure that we are dele 2367 * make sure that we are deleting the right entry. We might
2344 * also be pointing to a stal 2368 * also be pointing to a stale entry in the unused part of
2345 * old_bh so just checking in 2369 * old_bh so just checking inum and the name isn't enough. */
2346 struct buffer_head *old_bh2; 2370 struct buffer_head *old_bh2;
2347 struct ext3_dir_entry_2 *old_ 2371 struct ext3_dir_entry_2 *old_de2;
2348 2372
2349 old_bh2 = ext3_find_entry(old !! 2373 old_bh2 = ext3_find_entry(old_dir, &old_dentry->d_name,
>> 2374 &old_de2);
2350 if (old_bh2) { 2375 if (old_bh2) {
2351 retval = ext3_delete_ 2376 retval = ext3_delete_entry(handle, old_dir,
2352 2377 old_de2, old_bh2);
2353 brelse(old_bh2); 2378 brelse(old_bh2);
2354 } 2379 }
2355 } 2380 }
2356 if (retval) { 2381 if (retval) {
2357 ext3_warning(old_dir->i_sb, " 2382 ext3_warning(old_dir->i_sb, "ext3_rename",
2358 "Deleting old 2383 "Deleting old file (%lu), %d, error=%d",
2359 old_dir->i_in 2384 old_dir->i_ino, old_dir->i_nlink, retval);
2360 } 2385 }
2361 2386
2362 if (new_inode) { 2387 if (new_inode) {
2363 drop_nlink(new_inode); 2388 drop_nlink(new_inode);
2364 new_inode->i_ctime = CURRENT_ 2389 new_inode->i_ctime = CURRENT_TIME_SEC;
2365 } 2390 }
2366 old_dir->i_ctime = old_dir->i_mtime = 2391 old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC;
2367 ext3_update_dx_flag(old_dir); 2392 ext3_update_dx_flag(old_dir);
2368 if (dir_bh) { 2393 if (dir_bh) {
2369 BUFFER_TRACE(dir_bh, "get_wri 2394 BUFFER_TRACE(dir_bh, "get_write_access");
2370 ext3_journal_get_write_access 2395 ext3_journal_get_write_access(handle, dir_bh);
2371 PARENT_INO(dir_bh->b_data) = 2396 PARENT_INO(dir_bh->b_data) = cpu_to_le32(new_dir->i_ino);
2372 BUFFER_TRACE(dir_bh, "call ex 2397 BUFFER_TRACE(dir_bh, "call ext3_journal_dirty_metadata");
2373 ext3_journal_dirty_metadata(h 2398 ext3_journal_dirty_metadata(handle, dir_bh);
2374 drop_nlink(old_dir); 2399 drop_nlink(old_dir);
2375 if (new_inode) { 2400 if (new_inode) {
2376 drop_nlink(new_inode) 2401 drop_nlink(new_inode);
2377 } else { 2402 } else {
2378 inc_nlink(new_dir); 2403 inc_nlink(new_dir);
2379 ext3_update_dx_flag(n 2404 ext3_update_dx_flag(new_dir);
2380 ext3_mark_inode_dirty 2405 ext3_mark_inode_dirty(handle, new_dir);
2381 } 2406 }
2382 } 2407 }
2383 ext3_mark_inode_dirty(handle, old_dir 2408 ext3_mark_inode_dirty(handle, old_dir);
2384 if (new_inode) { 2409 if (new_inode) {
2385 ext3_mark_inode_dirty(handle, 2410 ext3_mark_inode_dirty(handle, new_inode);
2386 if (!new_inode->i_nlink) 2411 if (!new_inode->i_nlink)
2387 ext3_orphan_add(handl 2412 ext3_orphan_add(handle, new_inode);
>> 2413 if (ext3_should_writeback_data(new_inode))
>> 2414 flush_file = 1;
2388 } 2415 }
2389 retval = 0; 2416 retval = 0;
2390 2417
2391 end_rename: 2418 end_rename:
2392 brelse (dir_bh); 2419 brelse (dir_bh);
2393 brelse (old_bh); 2420 brelse (old_bh);
2394 brelse (new_bh); 2421 brelse (new_bh);
2395 ext3_journal_stop(handle); 2422 ext3_journal_stop(handle);
>> 2423 if (retval == 0 && flush_file)
>> 2424 filemap_flush(old_inode->i_mapping);
2396 return retval; 2425 return retval;
2397 } 2426 }
2398 2427
2399 /* 2428 /*
2400 * directories can handle most operations... 2429 * directories can handle most operations...
2401 */ 2430 */
2402 const struct inode_operations ext3_dir_inode_ 2431 const struct inode_operations ext3_dir_inode_operations = {
2403 .create = ext3_create, 2432 .create = ext3_create,
2404 .lookup = ext3_lookup, 2433 .lookup = ext3_lookup,
2405 .link = ext3_link, 2434 .link = ext3_link,
2406 .unlink = ext3_unlink, 2435 .unlink = ext3_unlink,
2407 .symlink = ext3_symlink, 2436 .symlink = ext3_symlink,
2408 .mkdir = ext3_mkdir, 2437 .mkdir = ext3_mkdir,
2409 .rmdir = ext3_rmdir, 2438 .rmdir = ext3_rmdir,
2410 .mknod = ext3_mknod, 2439 .mknod = ext3_mknod,
2411 .rename = ext3_rename, 2440 .rename = ext3_rename,
2412 .setattr = ext3_setattr, 2441 .setattr = ext3_setattr,
2413 #ifdef CONFIG_EXT3_FS_XATTR 2442 #ifdef CONFIG_EXT3_FS_XATTR
2414 .setxattr = generic_setxattr, 2443 .setxattr = generic_setxattr,
2415 .getxattr = generic_getxattr, 2444 .getxattr = generic_getxattr,
2416 .listxattr = ext3_listxattr, 2445 .listxattr = ext3_listxattr,
2417 .removexattr = generic_removexattr 2446 .removexattr = generic_removexattr,
2418 #endif 2447 #endif
2419 .permission = ext3_permission, 2448 .permission = ext3_permission,
2420 }; 2449 };
2421 2450
2422 const struct inode_operations ext3_special_in 2451 const struct inode_operations ext3_special_inode_operations = {
2423 .setattr = ext3_setattr, 2452 .setattr = ext3_setattr,
2424 #ifdef CONFIG_EXT3_FS_XATTR 2453 #ifdef CONFIG_EXT3_FS_XATTR
2425 .setxattr = generic_setxattr, 2454 .setxattr = generic_setxattr,
2426 .getxattr = generic_getxattr, 2455 .getxattr = generic_getxattr,
2427 .listxattr = ext3_listxattr, 2456 .listxattr = ext3_listxattr,
2428 .removexattr = generic_removexattr 2457 .removexattr = generic_removexattr,
2429 #endif 2458 #endif
2430 .permission = ext3_permission, 2459 .permission = ext3_permission,
2431 }; 2460 };
2432 2461
|
This page was automatically generated by the
LXR engine.
|