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