Blame view
fs/ext4/namei.c
70.4 KB
ac27a0ec1 [PATCH] ext4: ini... |
1 |
/* |
617ba13b3 [PATCH] ext4: ren... |
2 |
* linux/fs/ext4/namei.c |
ac27a0ec1 [PATCH] ext4: ini... |
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* * 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 * for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998 * Hash Tree Directory indexing (c) * Daniel Phillips, 2001 * Hash Tree Directory indexing porting * Christopher Li, 2002 * Hash Tree Directory indexing cleanup * Theodore Ts'o, 2002 */ #include <linux/fs.h> #include <linux/pagemap.h> |
dab291af8 [PATCH] jbd2: ena... |
29 |
#include <linux/jbd2.h> |
ac27a0ec1 [PATCH] ext4: ini... |
30 |
#include <linux/time.h> |
ac27a0ec1 [PATCH] ext4: ini... |
31 32 33 34 35 36 |
#include <linux/fcntl.h> #include <linux/stat.h> #include <linux/string.h> #include <linux/quotaops.h> #include <linux/buffer_head.h> #include <linux/bio.h> |
3dcf54515 ext4: move header... |
37 38 |
#include "ext4.h" #include "ext4_jbd2.h" |
ac27a0ec1 [PATCH] ext4: ini... |
39 |
|
ac27a0ec1 [PATCH] ext4: ini... |
40 41 |
#include "xattr.h" #include "acl.h" |
0562e0bad ext4: add more tr... |
42 |
#include <trace/events/ext4.h> |
ac27a0ec1 [PATCH] ext4: ini... |
43 44 45 46 47 |
/* * define how far ahead to read directories while searching them. */ #define NAMEI_RA_CHUNKS 2 #define NAMEI_RA_BLOCKS 4 |
8c55e2041 EXT4: Fix whitespace |
48 |
#define NAMEI_RA_SIZE (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS) |
ac27a0ec1 [PATCH] ext4: ini... |
49 |
#define NAMEI_RA_INDEX(c,b) (((c) * NAMEI_RA_BLOCKS) + (b)) |
617ba13b3 [PATCH] ext4: ren... |
50 |
static struct buffer_head *ext4_append(handle_t *handle, |
ac27a0ec1 [PATCH] ext4: ini... |
51 |
struct inode *inode, |
725d26d3f ext4: Introduce e... |
52 |
ext4_lblk_t *block, int *err) |
ac27a0ec1 [PATCH] ext4: ini... |
53 54 55 56 |
{ struct buffer_head *bh; *block = inode->i_size >> inode->i_sb->s_blocksize_bits; |
a871611b4 ext4: check ext4_... |
57 58 |
bh = ext4_bread(handle, inode, *block, 1, err); if (bh) { |
ac27a0ec1 [PATCH] ext4: ini... |
59 |
inode->i_size += inode->i_sb->s_blocksize; |
617ba13b3 [PATCH] ext4: ren... |
60 |
EXT4_I(inode)->i_disksize = inode->i_size; |
a871611b4 ext4: check ext4_... |
61 62 63 64 65 |
*err = ext4_journal_get_write_access(handle, bh); if (*err) { brelse(bh); bh = NULL; } |
ac27a0ec1 [PATCH] ext4: ini... |
66 67 68 69 70 71 72 |
} return bh; } #ifndef assert #define assert(test) J_ASSERT(test) #endif |
ac27a0ec1 [PATCH] ext4: ini... |
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 130 131 132 133 134 135 136 137 138 139 |
#ifdef DX_DEBUG #define dxtrace(command) command #else #define dxtrace(command) #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_... |
140 141 |
u16 offs; u16 size; |
ac27a0ec1 [PATCH] ext4: ini... |
142 |
}; |
725d26d3f ext4: Introduce e... |
143 144 |
static inline ext4_lblk_t dx_get_block(struct dx_entry *entry); static void dx_set_block(struct dx_entry *entry, ext4_lblk_t value); |
af5bc92dd ext4: Fix whitesp... |
145 146 147 148 149 150 151 152 |
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); |
f702ba0fd ext4: Don't use '... |
153 |
static struct dx_frame *dx_probe(const struct qstr *d_name, |
ac27a0ec1 [PATCH] ext4: ini... |
154 155 156 157 |
struct inode *dir, struct dx_hash_info *hinfo, struct dx_frame *frame, int *err); |
af5bc92dd ext4: Fix whitesp... |
158 |
static void dx_release(struct dx_frame *frames); |
8bad4597c ext4: Use unsigne... |
159 |
static int dx_make_map(struct ext4_dir_entry_2 *de, unsigned blocksize, |
af5bc92dd ext4: Fix whitesp... |
160 |
struct dx_hash_info *hinfo, struct dx_map_entry map[]); |
ac27a0ec1 [PATCH] ext4: ini... |
161 |
static void dx_sort_map(struct dx_map_entry *map, unsigned count); |
af5bc92dd ext4: Fix whitesp... |
162 |
static struct ext4_dir_entry_2 *dx_move_dirents(char *from, char *to, |
3d0518f47 ext4: New rec_len... |
163 |
struct dx_map_entry *offsets, int count, unsigned blocksize); |
8bad4597c ext4: Use unsigne... |
164 |
static struct ext4_dir_entry_2* dx_pack_dirents(char *base, unsigned blocksize); |
725d26d3f ext4: Introduce e... |
165 166 |
static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block); |
617ba13b3 [PATCH] ext4: ren... |
167 |
static int ext4_htree_next_block(struct inode *dir, __u32 hash, |
ac27a0ec1 [PATCH] ext4: ini... |
168 169 170 |
struct dx_frame *frame, struct dx_frame *frames, __u32 *start_hash); |
f702ba0fd ext4: Don't use '... |
171 172 173 174 |
static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct qstr *d_name, struct ext4_dir_entry_2 **res_dir, int *err); |
617ba13b3 [PATCH] ext4: ren... |
175 |
static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry, |
ac27a0ec1 [PATCH] ext4: ini... |
176 177 178 |
struct inode *inode); /* |
f795e1407 ext4: fix build f... |
179 180 181 |
* p is at least 6 bytes before the end of page */ static inline struct ext4_dir_entry_2 * |
3d0518f47 ext4: New rec_len... |
182 |
ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) |
f795e1407 ext4: fix build f... |
183 184 |
{ return (struct ext4_dir_entry_2 *)((char *)p + |
3d0518f47 ext4: New rec_len... |
185 |
ext4_rec_len_from_disk(p->rec_len, blocksize)); |
f795e1407 ext4: fix build f... |
186 187 188 |
} /* |
ac27a0ec1 [PATCH] ext4: ini... |
189 190 191 |
* Future: use high four bits of block for coalesce-on-delete flags * Mask them off for now. */ |
725d26d3f ext4: Introduce e... |
192 |
static inline ext4_lblk_t dx_get_block(struct dx_entry *entry) |
ac27a0ec1 [PATCH] ext4: ini... |
193 194 195 |
{ return le32_to_cpu(entry->block) & 0x00ffffff; } |
725d26d3f ext4: Introduce e... |
196 |
static inline void dx_set_block(struct dx_entry *entry, ext4_lblk_t value) |
ac27a0ec1 [PATCH] ext4: ini... |
197 198 199 |
{ entry->block = cpu_to_le32(value); } |
af5bc92dd ext4: Fix whitesp... |
200 |
static inline unsigned dx_get_hash(struct dx_entry *entry) |
ac27a0ec1 [PATCH] ext4: ini... |
201 202 203 |
{ return le32_to_cpu(entry->hash); } |
af5bc92dd ext4: Fix whitesp... |
204 |
static inline void dx_set_hash(struct dx_entry *entry, unsigned value) |
ac27a0ec1 [PATCH] ext4: ini... |
205 206 207 |
{ entry->hash = cpu_to_le32(value); } |
af5bc92dd ext4: Fix whitesp... |
208 |
static inline unsigned dx_get_count(struct dx_entry *entries) |
ac27a0ec1 [PATCH] ext4: ini... |
209 210 211 |
{ return le16_to_cpu(((struct dx_countlimit *) entries)->count); } |
af5bc92dd ext4: Fix whitesp... |
212 |
static inline unsigned dx_get_limit(struct dx_entry *entries) |
ac27a0ec1 [PATCH] ext4: ini... |
213 214 215 |
{ return le16_to_cpu(((struct dx_countlimit *) entries)->limit); } |
af5bc92dd ext4: Fix whitesp... |
216 |
static inline void dx_set_count(struct dx_entry *entries, unsigned value) |
ac27a0ec1 [PATCH] ext4: ini... |
217 218 219 |
{ ((struct dx_countlimit *) entries)->count = cpu_to_le16(value); } |
af5bc92dd ext4: Fix whitesp... |
220 |
static inline void dx_set_limit(struct dx_entry *entries, unsigned value) |
ac27a0ec1 [PATCH] ext4: ini... |
221 222 223 |
{ ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value); } |
af5bc92dd ext4: Fix whitesp... |
224 |
static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize) |
ac27a0ec1 [PATCH] ext4: ini... |
225 |
{ |
617ba13b3 [PATCH] ext4: ren... |
226 227 |
unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) - EXT4_DIR_REC_LEN(2) - infosize; |
d9c769b76 ext4: cleanup nev... |
228 |
return entry_space / sizeof(struct dx_entry); |
ac27a0ec1 [PATCH] ext4: ini... |
229 |
} |
af5bc92dd ext4: Fix whitesp... |
230 |
static inline unsigned dx_node_limit(struct inode *dir) |
ac27a0ec1 [PATCH] ext4: ini... |
231 |
{ |
617ba13b3 [PATCH] ext4: ren... |
232 |
unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0); |
d9c769b76 ext4: cleanup nev... |
233 |
return entry_space / sizeof(struct dx_entry); |
ac27a0ec1 [PATCH] ext4: ini... |
234 235 236 237 238 239 |
} /* * Debug */ #ifdef DX_DEBUG |
4776004f5 ext4: Add printk ... |
240 |
static void dx_show_index(char * label, struct dx_entry *entries) |
ac27a0ec1 [PATCH] ext4: ini... |
241 |
{ |
63f579335 [PATCH] ext4 whit... |
242 |
int i, n = dx_get_count (entries); |
4776004f5 ext4: Add printk ... |
243 |
printk(KERN_DEBUG "%s index ", label); |
63f579335 [PATCH] ext4 whit... |
244 |
for (i = 0; i < n; i++) { |
4776004f5 ext4: Add printk ... |
245 |
printk("%x->%lu ", i ? dx_get_hash(entries + i) : |
725d26d3f ext4: Introduce e... |
246 |
0, (unsigned long)dx_get_block(entries + i)); |
63f579335 [PATCH] ext4 whit... |
247 248 249 |
} printk(" "); |
ac27a0ec1 [PATCH] ext4: ini... |
250 251 252 253 254 255 256 257 |
} struct stats { unsigned names; unsigned space; unsigned bcount; }; |
617ba13b3 [PATCH] ext4: ren... |
258 |
static struct stats dx_show_leaf(struct dx_hash_info *hinfo, struct ext4_dir_entry_2 *de, |
ac27a0ec1 [PATCH] ext4: ini... |
259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 |
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++); |
617ba13b3 [PATCH] ext4: ren... |
275 |
ext4fs_dirhash(de->name, de->name_len, &h); |
ac27a0ec1 [PATCH] ext4: ini... |
276 |
printk(":%x.%u ", h.hash, |
265c6a0f9 ext4: fix compila... |
277 |
(unsigned) ((char *) de - base)); |
ac27a0ec1 [PATCH] ext4: ini... |
278 |
} |
617ba13b3 [PATCH] ext4: ren... |
279 |
space += EXT4_DIR_REC_LEN(de->name_len); |
ac27a0ec1 [PATCH] ext4: ini... |
280 281 |
names++; } |
3d0518f47 ext4: New rec_len... |
282 |
de = ext4_next_entry(de, size); |
ac27a0ec1 [PATCH] ext4: ini... |
283 284 285 286 287 288 289 290 291 292 |
} 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; |
af5bc92dd ext4: Fix whitesp... |
293 |
unsigned count = dx_get_count(entries), names = 0, space = 0, i; |
ac27a0ec1 [PATCH] ext4: ini... |
294 295 296 297 298 299 300 |
unsigned bcount = 0; struct buffer_head *bh; int err; printk("%i indexed blocks... ", count); for (i = 0; i < count; i++, entries++) { |
725d26d3f ext4: Introduce e... |
301 302 |
ext4_lblk_t block = dx_get_block(entries); ext4_lblk_t hash = i ? dx_get_hash(entries): 0; |
ac27a0ec1 [PATCH] ext4: ini... |
303 304 305 |
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); |
617ba13b3 [PATCH] ext4: ren... |
306 |
if (!(bh = ext4_bread (NULL,dir, block, 0,&err))) continue; |
ac27a0ec1 [PATCH] ext4: ini... |
307 308 |
stats = levels? dx_show_entries(hinfo, dir, ((struct dx_node *) bh->b_data)->entries, levels - 1): |
617ba13b3 [PATCH] ext4: ren... |
309 |
dx_show_leaf(hinfo, (struct ext4_dir_entry_2 *) bh->b_data, blocksize, 0); |
ac27a0ec1 [PATCH] ext4: ini... |
310 311 312 |
names += stats.names; space += stats.space; bcount += stats.bcount; |
af5bc92dd ext4: Fix whitesp... |
313 |
brelse(bh); |
ac27a0ec1 [PATCH] ext4: ini... |
314 315 |
} if (bcount) |
60e6679e2 ext4: Drop whites... |
316 317 |
printk(KERN_DEBUG "%snames %u, fullness %u (%u%%) ", |
4776004f5 ext4: Add printk ... |
318 319 |
levels ? "" : " ", names, space/bcount, (space/bcount)*100/blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
320 321 322 323 324 325 326 327 328 329 330 331 332 333 |
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 * |
f702ba0fd ext4: Don't use '... |
334 |
dx_probe(const struct qstr *d_name, struct inode *dir, |
ac27a0ec1 [PATCH] ext4: ini... |
335 336 337 338 339 340 341 342 343 344 |
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; |
617ba13b3 [PATCH] ext4: ren... |
345 |
if (!(bh = ext4_bread (NULL,dir, 0, 0, err))) |
ac27a0ec1 [PATCH] ext4: ini... |
346 347 348 349 350 |
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) { |
12062dddd ext4: move __func... |
351 |
ext4_warning(dir->i_sb, "Unrecognised inode hash code %d", |
ac27a0ec1 [PATCH] ext4: ini... |
352 353 354 355 356 357 |
root->info.hash_version); brelse(bh); *err = ERR_BAD_DX_DIR; goto fail; } hinfo->hash_version = root->info.hash_version; |
f99b25897 ext4: Add support... |
358 359 |
if (hinfo->hash_version <= DX_HASH_TEA) hinfo->hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned; |
617ba13b3 [PATCH] ext4: ren... |
360 |
hinfo->seed = EXT4_SB(dir->i_sb)->s_hash_seed; |
f702ba0fd ext4: Don't use '... |
361 362 |
if (d_name) ext4fs_dirhash(d_name->name, d_name->len, hinfo); |
ac27a0ec1 [PATCH] ext4: ini... |
363 364 365 |
hash = hinfo->hash; if (root->info.unused_flags & 1) { |
12062dddd ext4: move __func... |
366 |
ext4_warning(dir->i_sb, "Unimplemented inode hash flags: %#06x", |
ac27a0ec1 [PATCH] ext4: ini... |
367 368 369 370 371 372 373 |
root->info.unused_flags); brelse(bh); *err = ERR_BAD_DX_DIR; goto fail; } if ((indirect = root->info.indirect_levels) > 1) { |
12062dddd ext4: move __func... |
374 |
ext4_warning(dir->i_sb, "Unimplemented inode hash depth: %#06x", |
ac27a0ec1 [PATCH] ext4: ini... |
375 376 377 378 379 380 381 382 |
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)) { |
12062dddd ext4: move __func... |
386 |
ext4_warning(dir->i_sb, "dx entry: limit != root limit"); |
3d82abae9 dir_index: error ... |
387 388 389 390 |
brelse(bh); *err = ERR_BAD_DX_DIR; goto fail; } |
af5bc92dd ext4: Fix whitesp... |
391 |
dxtrace(printk("Look up %x", hash)); |
ac27a0ec1 [PATCH] ext4: ini... |
392 393 394 |
while (1) { count = dx_get_count(entries); |
3d82abae9 dir_index: error ... |
395 |
if (!count || count > dx_get_limit(entries)) { |
12062dddd ext4: move __func... |
396 |
ext4_warning(dir->i_sb, |
3d82abae9 dir_index: error ... |
397 398 399 400 401 |
"dx entry: no count or count > limit"); brelse(bh); *err = ERR_BAD_DX_DIR; goto fail2; } |
ac27a0ec1 [PATCH] ext4: ini... |
402 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 |
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; |
617ba13b3 [PATCH] ext4: ren... |
437 |
if (!(bh = ext4_bread (NULL,dir, dx_get_block(at), 0, err))) |
ac27a0ec1 [PATCH] ext4: ini... |
438 439 |
goto fail2; at = entries = ((struct dx_node *) bh->b_data)->entries; |
3d82abae9 dir_index: error ... |
440 |
if (dx_get_limit(entries) != dx_node_limit (dir)) { |
12062dddd ext4: move __func... |
441 |
ext4_warning(dir->i_sb, |
3d82abae9 dir_index: error ... |
442 443 444 445 446 |
"dx entry: limit != node limit"); brelse(bh); *err = ERR_BAD_DX_DIR; goto fail2; } |
ac27a0ec1 [PATCH] ext4: ini... |
447 |
frame++; |
3d82abae9 dir_index: error ... |
448 |
frame->bh = NULL; |
ac27a0ec1 [PATCH] ext4: ini... |
449 450 451 452 453 454 455 |
} fail2: while (frame >= frame_in) { brelse(frame->bh); frame--; } fail: |
3d82abae9 dir_index: error ... |
456 |
if (*err == ERR_BAD_DX_DIR) |
12062dddd ext4: move __func... |
457 |
ext4_warning(dir->i_sb, |
3d82abae9 dir_index: error ... |
458 459 |
"Corrupt dir inode %ld, running e2fsck is " "recommended.", dir->i_ino); |
ac27a0ec1 [PATCH] ext4: ini... |
460 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 |
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. */ |
617ba13b3 [PATCH] ext4: ren... |
490 |
static int ext4_htree_next_block(struct inode *dir, __u32 hash, |
ac27a0ec1 [PATCH] ext4: ini... |
491 492 493 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 |
struct dx_frame *frame, struct dx_frame *frames, __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--) { |
617ba13b3 [PATCH] ext4: ren... |
536 |
if (!(bh = ext4_bread(NULL, dir, dx_get_block(p->at), |
ac27a0ec1 [PATCH] ext4: ini... |
537 538 539 |
0, &err))) return err; /* Failure */ p++; |
af5bc92dd ext4: Fix whitesp... |
540 |
brelse(p->bh); |
ac27a0ec1 [PATCH] ext4: ini... |
541 542 543 544 545 546 547 548 |
p->bh = bh; p->at = p->entries = ((struct dx_node *) bh->b_data)->entries; } return 1; } /* |
ac27a0ec1 [PATCH] ext4: ini... |
549 550 551 552 553 |
* 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, |
725d26d3f ext4: Introduce e... |
554 |
struct inode *dir, ext4_lblk_t block, |
ac27a0ec1 [PATCH] ext4: ini... |
555 556 557 558 |
struct dx_hash_info *hinfo, __u32 start_hash, __u32 start_minor_hash) { struct buffer_head *bh; |
617ba13b3 [PATCH] ext4: ren... |
559 |
struct ext4_dir_entry_2 *de, *top; |
ac27a0ec1 [PATCH] ext4: ini... |
560 |
int err, count = 0; |
725d26d3f ext4: Introduce e... |
561 562 563 |
dxtrace(printk(KERN_INFO "In htree dirblock_to_tree: block %lu ", (unsigned long)block)); |
617ba13b3 [PATCH] ext4: ren... |
564 |
if (!(bh = ext4_bread (NULL, dir, block, 0, &err))) |
ac27a0ec1 [PATCH] ext4: ini... |
565 |
return err; |
617ba13b3 [PATCH] ext4: ren... |
566 567 |
de = (struct ext4_dir_entry_2 *) bh->b_data; top = (struct ext4_dir_entry_2 *) ((char *) de + |
ac27a0ec1 [PATCH] ext4: ini... |
568 |
dir->i_sb->s_blocksize - |
617ba13b3 [PATCH] ext4: ren... |
569 |
EXT4_DIR_REC_LEN(0)); |
3d0518f47 ext4: New rec_len... |
570 |
for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) { |
f7c21177a ext4: Use ext4_er... |
571 |
if (ext4_check_dir_entry(dir, NULL, de, bh, |
cad3f0076 ext4: optimize ex... |
572 573 |
(block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb)) + ((char *)de - bh->b_data))) { |
e6c402119 [PATCH] handle ex... |
574 575 576 |
/* 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; |
af5bc92dd ext4: Fix whitesp... |
577 |
brelse(bh); |
e6c402119 [PATCH] handle ex... |
578 579 |
return count; } |
617ba13b3 [PATCH] ext4: ren... |
580 |
ext4fs_dirhash(de->name, de->name_len, hinfo); |
ac27a0ec1 [PATCH] ext4: ini... |
581 582 583 584 585 586 |
if ((hinfo->hash < start_hash) || ((hinfo->hash == start_hash) && (hinfo->minor_hash < start_minor_hash))) continue; if (de->inode == 0) continue; |
617ba13b3 [PATCH] ext4: ren... |
587 |
if ((err = ext4_htree_store_dirent(dir_file, |
ac27a0ec1 [PATCH] ext4: ini... |
588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 |
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. */ |
617ba13b3 [PATCH] ext4: ren... |
607 |
int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, |
ac27a0ec1 [PATCH] ext4: ini... |
608 609 610 |
__u32 start_minor_hash, __u32 *next_hash) { struct dx_hash_info hinfo; |
617ba13b3 [PATCH] ext4: ren... |
611 |
struct ext4_dir_entry_2 *de; |
ac27a0ec1 [PATCH] ext4: ini... |
612 613 |
struct dx_frame frames[2], *frame; struct inode *dir; |
725d26d3f ext4: Introduce e... |
614 |
ext4_lblk_t block; |
ac27a0ec1 [PATCH] ext4: ini... |
615 |
int count = 0; |
725d26d3f ext4: Introduce e... |
616 |
int ret, err; |
ac27a0ec1 [PATCH] ext4: ini... |
617 |
__u32 hashval; |
60e6679e2 ext4: Drop whites... |
618 619 |
dxtrace(printk(KERN_DEBUG "In htree_fill_tree, start hash: %x:%x ", |
4776004f5 ext4: Add printk ... |
620 |
start_hash, start_minor_hash)); |
9d549890e [PATCH] ext4: cha... |
621 |
dir = dir_file->f_path.dentry->d_inode; |
12e9b8920 ext4: Use bitops ... |
622 |
if (!(ext4_test_inode_flag(dir, EXT4_INODE_INDEX))) { |
617ba13b3 [PATCH] ext4: ren... |
623 |
hinfo.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version; |
f99b25897 ext4: Add support... |
624 625 626 |
if (hinfo.hash_version <= DX_HASH_TEA) hinfo.hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned; |
617ba13b3 [PATCH] ext4: ren... |
627 |
hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed; |
ac27a0ec1 [PATCH] ext4: ini... |
628 629 630 631 632 633 634 |
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; |
f702ba0fd ext4: Don't use '... |
635 |
frame = dx_probe(NULL, dir, &hinfo, frames, &err); |
ac27a0ec1 [PATCH] ext4: ini... |
636 637 638 639 640 |
if (!frame) return err; /* Add '.' and '..' from the htree header */ if (!start_hash && !start_minor_hash) { |
617ba13b3 [PATCH] ext4: ren... |
641 642 |
de = (struct ext4_dir_entry_2 *) frames[0].bh->b_data; if ((err = ext4_htree_store_dirent(dir_file, 0, 0, de)) != 0) |
ac27a0ec1 [PATCH] ext4: ini... |
643 644 645 646 |
goto errout; count++; } if (start_hash < 2 || (start_hash ==2 && start_minor_hash==0)) { |
617ba13b3 [PATCH] ext4: ren... |
647 |
de = (struct ext4_dir_entry_2 *) frames[0].bh->b_data; |
3d0518f47 ext4: New rec_len... |
648 |
de = ext4_next_entry(de, dir->i_sb->s_blocksize); |
617ba13b3 [PATCH] ext4: ren... |
649 |
if ((err = ext4_htree_store_dirent(dir_file, 2, 0, de)) != 0) |
ac27a0ec1 [PATCH] ext4: ini... |
650 651 652 653 654 655 656 657 658 659 660 661 662 663 |
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; |
617ba13b3 [PATCH] ext4: ren... |
664 |
ret = ext4_htree_next_block(dir, HASH_NB_ALWAYS, |
ac27a0ec1 [PATCH] ext4: ini... |
665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 |
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); |
4776004f5 ext4: Add printk ... |
681 682 683 |
dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " "next hash: %x ", count, *next_hash)); |
ac27a0ec1 [PATCH] ext4: ini... |
684 685 686 687 688 689 690 691 692 693 |
return count; errout: dx_release(frames); return (err); } /* * Directory block splitting, compacting */ |
ef2b02d3e ext34: ensure do_... |
694 695 696 697 |
/* * Create map of hash values, offsets, and sizes, stored at end of block. * Returns number of entries mapped. */ |
8bad4597c ext4: Use unsigne... |
698 699 700 |
static int dx_make_map(struct ext4_dir_entry_2 *de, unsigned blocksize, struct dx_hash_info *hinfo, struct dx_map_entry *map_tail) |
ac27a0ec1 [PATCH] ext4: ini... |
701 702 703 704 |
{ int count = 0; char *base = (char *) de; struct dx_hash_info h = *hinfo; |
8bad4597c ext4: Use unsigne... |
705 |
while ((char *) de < base + blocksize) { |
ac27a0ec1 [PATCH] ext4: ini... |
706 |
if (de->name_len && de->inode) { |
617ba13b3 [PATCH] ext4: ren... |
707 |
ext4fs_dirhash(de->name, de->name_len, &h); |
ac27a0ec1 [PATCH] ext4: ini... |
708 709 |
map_tail--; map_tail->hash = h.hash; |
9aee22860 ext4: fix dx_map_... |
710 |
map_tail->offs = ((char *) de - base)>>2; |
ef2b02d3e ext34: ensure do_... |
711 |
map_tail->size = le16_to_cpu(de->rec_len); |
ac27a0ec1 [PATCH] ext4: ini... |
712 713 714 715 |
count++; cond_resched(); } /* XXX: do we need to check rec_len == 0 case? -Chris */ |
3d0518f47 ext4: New rec_len... |
716 |
de = ext4_next_entry(de, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
717 718 719 |
} return count; } |
ef2b02d3e ext34: ensure do_... |
720 |
/* Sort map by hash value */ |
ac27a0ec1 [PATCH] ext4: ini... |
721 722 |
static void dx_sort_map (struct dx_map_entry *map, unsigned count) { |
63f579335 [PATCH] ext4 whit... |
723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 |
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) |
ac27a0ec1 [PATCH] ext4: ini... |
740 |
continue; |
63f579335 [PATCH] ext4 whit... |
741 742 |
swap(*(q+1), *q); more = 1; |
ac27a0ec1 [PATCH] ext4: ini... |
743 744 745 |
} } while(more); } |
725d26d3f ext4: Introduce e... |
746 |
static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) |
ac27a0ec1 [PATCH] ext4: ini... |
747 748 749 750 751 752 753 754 755 756 757 758 |
{ 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); } |
ac27a0ec1 [PATCH] ext4: ini... |
759 |
|
617ba13b3 [PATCH] ext4: ren... |
760 |
static void ext4_update_dx_flag(struct inode *inode) |
ac27a0ec1 [PATCH] ext4: ini... |
761 |
{ |
617ba13b3 [PATCH] ext4: ren... |
762 763 |
if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) |
12e9b8920 ext4: Use bitops ... |
764 |
ext4_clear_inode_flag(inode, EXT4_INODE_INDEX); |
ac27a0ec1 [PATCH] ext4: ini... |
765 766 767 |
} /* |
617ba13b3 [PATCH] ext4: ren... |
768 |
* NOTE! unlike strncmp, ext4_match returns 1 for success, 0 for failure. |
ac27a0ec1 [PATCH] ext4: ini... |
769 |
* |
617ba13b3 [PATCH] ext4: ren... |
770 |
* `len <= EXT4_NAME_LEN' is guaranteed by caller. |
ac27a0ec1 [PATCH] ext4: ini... |
771 772 |
* `de != NULL' is guaranteed by caller. */ |
617ba13b3 [PATCH] ext4: ren... |
773 774 |
static inline int ext4_match (int len, const char * const name, struct ext4_dir_entry_2 * de) |
ac27a0ec1 [PATCH] ext4: ini... |
775 776 777 778 779 780 781 782 783 784 785 |
{ 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 */ |
af5bc92dd ext4: Fix whitesp... |
786 |
static inline int search_dirblock(struct buffer_head *bh, |
ac27a0ec1 [PATCH] ext4: ini... |
787 |
struct inode *dir, |
f702ba0fd ext4: Don't use '... |
788 |
const struct qstr *d_name, |
498e5f241 ext4: Change unsi... |
789 |
unsigned int offset, |
617ba13b3 [PATCH] ext4: ren... |
790 |
struct ext4_dir_entry_2 ** res_dir) |
ac27a0ec1 [PATCH] ext4: ini... |
791 |
{ |
617ba13b3 [PATCH] ext4: ren... |
792 |
struct ext4_dir_entry_2 * de; |
ac27a0ec1 [PATCH] ext4: ini... |
793 794 |
char * dlimit; int de_len; |
f702ba0fd ext4: Don't use '... |
795 796 |
const char *name = d_name->name; int namelen = d_name->len; |
ac27a0ec1 [PATCH] ext4: ini... |
797 |
|
617ba13b3 [PATCH] ext4: ren... |
798 |
de = (struct ext4_dir_entry_2 *) bh->b_data; |
ac27a0ec1 [PATCH] ext4: ini... |
799 800 801 802 803 804 |
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 && |
617ba13b3 [PATCH] ext4: ren... |
805 |
ext4_match (namelen, name, de)) { |
ac27a0ec1 [PATCH] ext4: ini... |
806 |
/* found a match - just to be sure, do a full check */ |
f7c21177a ext4: Use ext4_er... |
807 |
if (ext4_check_dir_entry(dir, NULL, de, bh, offset)) |
ac27a0ec1 [PATCH] ext4: ini... |
808 809 810 811 812 |
return -1; *res_dir = de; return 1; } /* prevent looping on a bad block */ |
3d0518f47 ext4: New rec_len... |
813 814 |
de_len = ext4_rec_len_from_disk(de->rec_len, dir->i_sb->s_blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
815 816 817 |
if (de_len <= 0) return -1; offset += de_len; |
617ba13b3 [PATCH] ext4: ren... |
818 |
de = (struct ext4_dir_entry_2 *) ((char *) de + de_len); |
ac27a0ec1 [PATCH] ext4: ini... |
819 820 821 822 823 824 |
} return 0; } /* |
617ba13b3 [PATCH] ext4: ren... |
825 |
* ext4_find_entry() |
ac27a0ec1 [PATCH] ext4: ini... |
826 827 828 829 830 831 832 833 834 |
* * 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. */ |
f702ba0fd ext4: Don't use '... |
835 836 |
static struct buffer_head * ext4_find_entry (struct inode *dir, const struct qstr *d_name, |
617ba13b3 [PATCH] ext4: ren... |
837 |
struct ext4_dir_entry_2 ** res_dir) |
ac27a0ec1 [PATCH] ext4: ini... |
838 |
{ |
af5bc92dd ext4: Fix whitesp... |
839 840 841 |
struct super_block *sb; struct buffer_head *bh_use[NAMEI_RA_SIZE]; struct buffer_head *bh, *ret = NULL; |
725d26d3f ext4: Introduce e... |
842 |
ext4_lblk_t start, block, b; |
8941ec8bb ext4: avoid unini... |
843 |
const u8 *name = d_name->name; |
ac27a0ec1 [PATCH] ext4: ini... |
844 845 846 847 848 |
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; |
725d26d3f ext4: Introduce e... |
849 850 |
ext4_lblk_t nblocks; int i, err; |
ac27a0ec1 [PATCH] ext4: ini... |
851 |
int namelen; |
ac27a0ec1 [PATCH] ext4: ini... |
852 853 854 |
*res_dir = NULL; sb = dir->i_sb; |
f702ba0fd ext4: Don't use '... |
855 |
namelen = d_name->len; |
617ba13b3 [PATCH] ext4: ren... |
856 |
if (namelen > EXT4_NAME_LEN) |
ac27a0ec1 [PATCH] ext4: ini... |
857 |
return NULL; |
8941ec8bb ext4: avoid unini... |
858 |
if ((namelen <= 2) && (name[0] == '.') && |
6d5c3aa84 ext4: fix typo wh... |
859 |
(name[1] == '.' || name[1] == '\0')) { |
8941ec8bb ext4: avoid unini... |
860 861 862 863 864 865 866 867 |
/* * "." 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; } |
ac27a0ec1 [PATCH] ext4: ini... |
868 |
if (is_dx(dir)) { |
f702ba0fd ext4: Don't use '... |
869 |
bh = ext4_dx_find_entry(dir, d_name, res_dir, &err); |
ac27a0ec1 [PATCH] ext4: ini... |
870 871 872 873 874 875 876 |
/* * 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; |
4776004f5 ext4: Add printk ... |
877 878 879 |
dxtrace(printk(KERN_DEBUG "ext4_find_entry: dx failed, " "falling back ")); |
ac27a0ec1 [PATCH] ext4: ini... |
880 |
} |
617ba13b3 [PATCH] ext4: ren... |
881 882 |
nblocks = dir->i_size >> EXT4_BLOCK_SIZE_BITS(sb); start = EXT4_I(dir)->i_dir_start_lookup; |
ac27a0ec1 [PATCH] ext4: ini... |
883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 |
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++; |
617ba13b3 [PATCH] ext4: ren... |
906 |
bh = ext4_getblk(NULL, dir, b++, 0, &err); |
ac27a0ec1 [PATCH] ext4: ini... |
907 908 |
bh_use[ra_max] = bh; if (bh) |
65299a3b7 block: separate p... |
909 910 |
ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh); |
ac27a0ec1 [PATCH] ext4: ini... |
911 912 913 914 915 916 917 |
} } 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 */ |
24676da46 ext4: Convert cal... |
918 919 |
EXT4_ERROR_INODE(dir, "reading directory lblock %lu", (unsigned long) block); |
ac27a0ec1 [PATCH] ext4: ini... |
920 921 922 |
brelse(bh); goto next; } |
f702ba0fd ext4: Don't use '... |
923 |
i = search_dirblock(bh, dir, d_name, |
617ba13b3 [PATCH] ext4: ren... |
924 |
block << EXT4_BLOCK_SIZE_BITS(sb), res_dir); |
ac27a0ec1 [PATCH] ext4: ini... |
925 |
if (i == 1) { |
617ba13b3 [PATCH] ext4: ren... |
926 |
EXT4_I(dir)->i_dir_start_lookup = block; |
ac27a0ec1 [PATCH] ext4: ini... |
927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 |
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; |
617ba13b3 [PATCH] ext4: ren... |
944 |
nblocks = dir->i_size >> EXT4_BLOCK_SIZE_BITS(sb); |
ac27a0ec1 [PATCH] ext4: ini... |
945 946 947 948 949 950 951 952 |
if (block < nblocks) { start = 0; goto restart; } cleanup_and_exit: /* Clean up the read-ahead blocks */ for (; ra_ptr < ra_max; ra_ptr++) |
af5bc92dd ext4: Fix whitesp... |
953 |
brelse(bh_use[ra_ptr]); |
ac27a0ec1 [PATCH] ext4: ini... |
954 955 |
return ret; } |
f702ba0fd ext4: Don't use '... |
956 |
static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct qstr *d_name, |
617ba13b3 [PATCH] ext4: ren... |
957 |
struct ext4_dir_entry_2 **res_dir, int *err) |
ac27a0ec1 [PATCH] ext4: ini... |
958 |
{ |
8941ec8bb ext4: avoid unini... |
959 |
struct super_block * sb = dir->i_sb; |
ac27a0ec1 [PATCH] ext4: ini... |
960 |
struct dx_hash_info hinfo; |
ac27a0ec1 [PATCH] ext4: ini... |
961 |
struct dx_frame frames[2], *frame; |
ac27a0ec1 [PATCH] ext4: ini... |
962 |
struct buffer_head *bh; |
725d26d3f ext4: Introduce e... |
963 |
ext4_lblk_t block; |
ac27a0ec1 [PATCH] ext4: ini... |
964 |
int retval; |
ac27a0ec1 [PATCH] ext4: ini... |
965 |
|
8941ec8bb ext4: avoid unini... |
966 967 |
if (!(frame = dx_probe(d_name, dir, &hinfo, frames, err))) return NULL; |
ac27a0ec1 [PATCH] ext4: ini... |
968 969 |
do { block = dx_get_block(frame->at); |
7845c0497 ext4: use search_... |
970 |
if (!(bh = ext4_bread(NULL, dir, block, 0, err))) |
ac27a0ec1 [PATCH] ext4: ini... |
971 |
goto errout; |
f3b35f063 ext4: validate di... |
972 |
|
7845c0497 ext4: use search_... |
973 974 975 976 977 978 |
retval = search_dirblock(bh, dir, d_name, block << EXT4_BLOCK_SIZE_BITS(sb), res_dir); if (retval == 1) { /* Success! */ dx_release(frames); return bh; |
ac27a0ec1 [PATCH] ext4: ini... |
979 |
} |
af5bc92dd ext4: Fix whitesp... |
980 |
brelse(bh); |
7845c0497 ext4: use search_... |
981 982 983 984 |
if (retval == -1) { *err = ERR_BAD_DX_DIR; goto errout; } |
ac27a0ec1 [PATCH] ext4: ini... |
985 |
/* Check to see if we should continue to search */ |
8941ec8bb ext4: avoid unini... |
986 |
retval = ext4_htree_next_block(dir, hinfo.hash, frame, |
ac27a0ec1 [PATCH] ext4: ini... |
987 988 |
frames, NULL); if (retval < 0) { |
12062dddd ext4: move __func... |
989 |
ext4_warning(sb, |
ac27a0ec1 [PATCH] ext4: ini... |
990 991 992 993 994 995 996 997 998 |
"error reading index page in directory #%lu", dir->i_ino); *err = retval; goto errout; } } while (retval == 1); *err = -ENOENT; errout: |
265c6a0f9 ext4: fix compila... |
999 1000 |
dxtrace(printk(KERN_DEBUG "%s not found ", d_name->name)); |
ac27a0ec1 [PATCH] ext4: ini... |
1001 1002 1003 |
dx_release (frames); return NULL; } |
ac27a0ec1 [PATCH] ext4: ini... |
1004 |
|
af5bc92dd ext4: Fix whitesp... |
1005 |
static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) |
ac27a0ec1 [PATCH] ext4: ini... |
1006 |
{ |
af5bc92dd ext4: Fix whitesp... |
1007 1008 1009 |
struct inode *inode; struct ext4_dir_entry_2 *de; struct buffer_head *bh; |
ac27a0ec1 [PATCH] ext4: ini... |
1010 |
|
617ba13b3 [PATCH] ext4: ren... |
1011 |
if (dentry->d_name.len > EXT4_NAME_LEN) |
ac27a0ec1 [PATCH] ext4: ini... |
1012 |
return ERR_PTR(-ENAMETOOLONG); |
f702ba0fd ext4: Don't use '... |
1013 |
bh = ext4_find_entry(dir, &dentry->d_name, &de); |
ac27a0ec1 [PATCH] ext4: ini... |
1014 1015 |
inode = NULL; if (bh) { |
498e5f241 ext4: Change unsi... |
1016 |
__u32 ino = le32_to_cpu(de->inode); |
af5bc92dd ext4: Fix whitesp... |
1017 |
brelse(bh); |
617ba13b3 [PATCH] ext4: ren... |
1018 |
if (!ext4_valid_inum(dir->i_sb, ino)) { |
24676da46 ext4: Convert cal... |
1019 |
EXT4_ERROR_INODE(dir, "bad inode number: %u", ino); |
1d1fe1ee0 iget: stop EXT4 f... |
1020 |
return ERR_PTR(-EIO); |
a6c15c2b0 ext3/ext4: orphan... |
1021 |
} |
1d1fe1ee0 iget: stop EXT4 f... |
1022 |
inode = ext4_iget(dir->i_sb, ino); |
a9049376e make d_splice_ali... |
1023 1024 1025 1026 1027 |
if (inode == ERR_PTR(-ESTALE)) { EXT4_ERROR_INODE(dir, "deleted inode referenced: %u", ino); return ERR_PTR(-EIO); |
e6f009b0b ext4: return -EIO... |
1028 |
} |
ac27a0ec1 [PATCH] ext4: ini... |
1029 1030 1031 |
} return d_splice_alias(inode, dentry); } |
617ba13b3 [PATCH] ext4: ren... |
1032 |
struct dentry *ext4_get_parent(struct dentry *child) |
ac27a0ec1 [PATCH] ext4: ini... |
1033 |
{ |
498e5f241 ext4: Change unsi... |
1034 |
__u32 ino; |
f702ba0fd ext4: Don't use '... |
1035 1036 1037 1038 |
static const struct qstr dotdot = { .name = "..", .len = 2, }; |
617ba13b3 [PATCH] ext4: ren... |
1039 |
struct ext4_dir_entry_2 * de; |
ac27a0ec1 [PATCH] ext4: ini... |
1040 |
struct buffer_head *bh; |
f702ba0fd ext4: Don't use '... |
1041 |
bh = ext4_find_entry(child->d_inode, &dotdot, &de); |
ac27a0ec1 [PATCH] ext4: ini... |
1042 1043 1044 1045 |
if (!bh) return ERR_PTR(-ENOENT); ino = le32_to_cpu(de->inode); brelse(bh); |
617ba13b3 [PATCH] ext4: ren... |
1046 |
if (!ext4_valid_inum(child->d_inode->i_sb, ino)) { |
24676da46 ext4: Convert cal... |
1047 1048 |
EXT4_ERROR_INODE(child->d_inode, "bad parent inode number: %u", ino); |
1d1fe1ee0 iget: stop EXT4 f... |
1049 |
return ERR_PTR(-EIO); |
a6c15c2b0 ext3/ext4: orphan... |
1050 |
} |
440037287 [PATCH] switch al... |
1051 |
return d_obtain_alias(ext4_iget(child->d_inode->i_sb, ino)); |
ac27a0ec1 [PATCH] ext4: ini... |
1052 1053 1054 |
} #define S_SHIFT 12 |
617ba13b3 [PATCH] ext4: ren... |
1055 1056 1057 1058 1059 1060 1061 1062 |
static unsigned char ext4_type_by_mode[S_IFMT >> S_SHIFT] = { [S_IFREG >> S_SHIFT] = EXT4_FT_REG_FILE, [S_IFDIR >> S_SHIFT] = EXT4_FT_DIR, [S_IFCHR >> S_SHIFT] = EXT4_FT_CHRDEV, [S_IFBLK >> S_SHIFT] = EXT4_FT_BLKDEV, [S_IFIFO >> S_SHIFT] = EXT4_FT_FIFO, [S_IFSOCK >> S_SHIFT] = EXT4_FT_SOCK, [S_IFLNK >> S_SHIFT] = EXT4_FT_SYMLINK, |
ac27a0ec1 [PATCH] ext4: ini... |
1063 |
}; |
617ba13b3 [PATCH] ext4: ren... |
1064 1065 |
static inline void ext4_set_de_type(struct super_block *sb, struct ext4_dir_entry_2 *de, |
ac27a0ec1 [PATCH] ext4: ini... |
1066 |
umode_t mode) { |
617ba13b3 [PATCH] ext4: ren... |
1067 1068 |
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE)) de->file_type = ext4_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; |
ac27a0ec1 [PATCH] ext4: ini... |
1069 |
} |
ef2b02d3e ext34: ensure do_... |
1070 1071 1072 1073 |
/* * Move count entries from end of map between two memory locations. * Returns pointer to last entry moved. */ |
617ba13b3 [PATCH] ext4: ren... |
1074 |
static struct ext4_dir_entry_2 * |
3d0518f47 ext4: New rec_len... |
1075 1076 |
dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count, unsigned blocksize) |
ac27a0ec1 [PATCH] ext4: ini... |
1077 1078 1079 1080 |
{ unsigned rec_len = 0; while (count--) { |
60e6679e2 ext4: Drop whites... |
1081 |
struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) |
9aee22860 ext4: fix dx_map_... |
1082 |
(from + (map->offs<<2)); |
617ba13b3 [PATCH] ext4: ren... |
1083 |
rec_len = EXT4_DIR_REC_LEN(de->name_len); |
ac27a0ec1 [PATCH] ext4: ini... |
1084 |
memcpy (to, de, rec_len); |
617ba13b3 [PATCH] ext4: ren... |
1085 |
((struct ext4_dir_entry_2 *) to)->rec_len = |
3d0518f47 ext4: New rec_len... |
1086 |
ext4_rec_len_to_disk(rec_len, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1087 1088 1089 1090 |
de->inode = 0; map++; to += rec_len; } |
617ba13b3 [PATCH] ext4: ren... |
1091 |
return (struct ext4_dir_entry_2 *) (to - rec_len); |
ac27a0ec1 [PATCH] ext4: ini... |
1092 |
} |
ef2b02d3e ext34: ensure do_... |
1093 1094 1095 1096 |
/* * Compact each dir entry in the range to the minimal rec_len. * Returns pointer to last entry in range. */ |
8bad4597c ext4: Use unsigne... |
1097 |
static struct ext4_dir_entry_2* dx_pack_dirents(char *base, unsigned blocksize) |
ac27a0ec1 [PATCH] ext4: ini... |
1098 |
{ |
617ba13b3 [PATCH] ext4: ren... |
1099 |
struct ext4_dir_entry_2 *next, *to, *prev, *de = (struct ext4_dir_entry_2 *) base; |
ac27a0ec1 [PATCH] ext4: ini... |
1100 1101 1102 |
unsigned rec_len = 0; prev = to = de; |
8bad4597c ext4: Use unsigne... |
1103 |
while ((char*)de < base + blocksize) { |
3d0518f47 ext4: New rec_len... |
1104 |
next = ext4_next_entry(de, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1105 |
if (de->inode && de->name_len) { |
617ba13b3 [PATCH] ext4: ren... |
1106 |
rec_len = EXT4_DIR_REC_LEN(de->name_len); |
ac27a0ec1 [PATCH] ext4: ini... |
1107 1108 |
if (de > to) memmove(to, de, rec_len); |
3d0518f47 ext4: New rec_len... |
1109 |
to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1110 |
prev = to; |
617ba13b3 [PATCH] ext4: ren... |
1111 |
to = (struct ext4_dir_entry_2 *) (((char *) to) + rec_len); |
ac27a0ec1 [PATCH] ext4: ini... |
1112 1113 1114 1115 1116 |
} de = next; } return prev; } |
ef2b02d3e ext34: ensure do_... |
1117 1118 1119 1120 1121 |
/* * 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. */ |
617ba13b3 [PATCH] ext4: ren... |
1122 |
static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir, |
ac27a0ec1 [PATCH] ext4: ini... |
1123 1124 1125 1126 1127 1128 |
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; |
725d26d3f ext4: Introduce e... |
1129 |
ext4_lblk_t newblock; |
ac27a0ec1 [PATCH] ext4: ini... |
1130 1131 1132 |
u32 hash2; struct dx_map_entry *map; char *data1 = (*bh)->b_data, *data2; |
59e315b4c ext3/4: Fix loop ... |
1133 |
unsigned split, move, size; |
617ba13b3 [PATCH] ext4: ren... |
1134 |
struct ext4_dir_entry_2 *de = NULL, *de2; |
59e315b4c ext3/4: Fix loop ... |
1135 |
int err = 0, i; |
ac27a0ec1 [PATCH] ext4: ini... |
1136 |
|
fedee54d8 ext3: dirindex er... |
1137 |
bh2 = ext4_append (handle, dir, &newblock, &err); |
ac27a0ec1 [PATCH] ext4: ini... |
1138 1139 1140 1141 1142 1143 1144 |
if (!(bh2)) { brelse(*bh); *bh = NULL; goto errout; } BUFFER_TRACE(*bh, "get_write_access"); |
617ba13b3 [PATCH] ext4: ren... |
1145 |
err = ext4_journal_get_write_access(handle, *bh); |
fedee54d8 ext3: dirindex er... |
1146 1147 |
if (err) goto journal_error; |
ac27a0ec1 [PATCH] ext4: ini... |
1148 |
BUFFER_TRACE(frame->bh, "get_write_access"); |
617ba13b3 [PATCH] ext4: ren... |
1149 |
err = ext4_journal_get_write_access(handle, frame->bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1150 1151 1152 1153 1154 1155 1156 |
if (err) goto journal_error; data2 = bh2->b_data; /* create map in the end of data2 block */ map = (struct dx_map_entry *) (data2 + blocksize); |
af5bc92dd ext4: Fix whitesp... |
1157 |
count = dx_make_map((struct ext4_dir_entry_2 *) data1, |
ac27a0ec1 [PATCH] ext4: ini... |
1158 1159 |
blocksize, hinfo, map); map -= count; |
af5bc92dd ext4: Fix whitesp... |
1160 |
dx_sort_map(map, count); |
ef2b02d3e ext34: ensure do_... |
1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 |
/* 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; |
ac27a0ec1 [PATCH] ext4: ini... |
1173 1174 |
hash2 = map[split].hash; continued = hash2 == map[split - 1].hash; |
725d26d3f ext4: Introduce e... |
1175 1176 1177 1178 |
dxtrace(printk(KERN_INFO "Split block %lu at %x, %i/%i ", (unsigned long)dx_get_block(frame->at), hash2, split, count-split)); |
ac27a0ec1 [PATCH] ext4: ini... |
1179 1180 |
/* Fancy dance to stay within two buffers */ |
3d0518f47 ext4: New rec_len... |
1181 |
de2 = dx_move_dirents(data1, data2, map + split, count - split, blocksize); |
af5bc92dd ext4: Fix whitesp... |
1182 |
de = dx_pack_dirents(data1, blocksize); |
3d0518f47 ext4: New rec_len... |
1183 1184 1185 1186 |
de->rec_len = ext4_rec_len_to_disk(data1 + blocksize - (char *) de, blocksize); de2->rec_len = ext4_rec_len_to_disk(data2 + blocksize - (char *) de2, blocksize); |
617ba13b3 [PATCH] ext4: ren... |
1187 1188 |
dxtrace(dx_show_leaf (hinfo, (struct ext4_dir_entry_2 *) data1, blocksize, 1)); dxtrace(dx_show_leaf (hinfo, (struct ext4_dir_entry_2 *) data2, blocksize, 1)); |
ac27a0ec1 [PATCH] ext4: ini... |
1189 1190 1191 1192 1193 1194 1195 |
/* Which block gets the new entry? */ if (hinfo->hash >= hash2) { swap(*bh, bh2); de = de2; } |
af5bc92dd ext4: Fix whitesp... |
1196 |
dx_insert_block(frame, hash2 + continued, newblock); |
0390131ba ext4: Allow ext4 ... |
1197 |
err = ext4_handle_dirty_metadata(handle, dir, bh2); |
ac27a0ec1 [PATCH] ext4: ini... |
1198 1199 |
if (err) goto journal_error; |
0390131ba ext4: Allow ext4 ... |
1200 |
err = ext4_handle_dirty_metadata(handle, dir, frame->bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1201 1202 |
if (err) goto journal_error; |
af5bc92dd ext4: Fix whitesp... |
1203 1204 |
brelse(bh2); dxtrace(dx_show_index("frame", frame->entries)); |
ac27a0ec1 [PATCH] ext4: ini... |
1205 |
return de; |
fedee54d8 ext3: dirindex er... |
1206 1207 1208 1209 1210 1211 1212 1213 1214 |
journal_error: brelse(*bh); brelse(bh2); *bh = NULL; ext4_std_error(dir->i_sb, err); errout: *error = err; return NULL; |
ac27a0ec1 [PATCH] ext4: ini... |
1215 |
} |
ac27a0ec1 [PATCH] ext4: ini... |
1216 1217 1218 1219 1220 1221 1222 1223 |
/* * 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. |
ac27a0ec1 [PATCH] ext4: ini... |
1224 1225 |
*/ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry, |
617ba13b3 [PATCH] ext4: ren... |
1226 |
struct inode *inode, struct ext4_dir_entry_2 *de, |
af5bc92dd ext4: Fix whitesp... |
1227 |
struct buffer_head *bh) |
ac27a0ec1 [PATCH] ext4: ini... |
1228 1229 1230 1231 |
{ struct inode *dir = dentry->d_parent->d_inode; const char *name = dentry->d_name.name; int namelen = dentry->d_name.len; |
498e5f241 ext4: Change unsi... |
1232 |
unsigned int offset = 0; |
3d0518f47 ext4: New rec_len... |
1233 |
unsigned int blocksize = dir->i_sb->s_blocksize; |
ac27a0ec1 [PATCH] ext4: ini... |
1234 1235 1236 |
unsigned short reclen; int nlen, rlen, err; char *top; |
617ba13b3 [PATCH] ext4: ren... |
1237 |
reclen = EXT4_DIR_REC_LEN(namelen); |
ac27a0ec1 [PATCH] ext4: ini... |
1238 |
if (!de) { |
617ba13b3 [PATCH] ext4: ren... |
1239 |
de = (struct ext4_dir_entry_2 *)bh->b_data; |
3d0518f47 ext4: New rec_len... |
1240 |
top = bh->b_data + blocksize - reclen; |
ac27a0ec1 [PATCH] ext4: ini... |
1241 |
while ((char *) de <= top) { |
f7c21177a ext4: Use ext4_er... |
1242 |
if (ext4_check_dir_entry(dir, NULL, de, bh, offset)) |
ac27a0ec1 [PATCH] ext4: ini... |
1243 |
return -EIO; |
2de770a40 ext4: fix potenti... |
1244 |
if (ext4_match(namelen, name, de)) |
ac27a0ec1 [PATCH] ext4: ini... |
1245 |
return -EEXIST; |
617ba13b3 [PATCH] ext4: ren... |
1246 |
nlen = EXT4_DIR_REC_LEN(de->name_len); |
3d0518f47 ext4: New rec_len... |
1247 |
rlen = ext4_rec_len_from_disk(de->rec_len, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1248 1249 |
if ((de->inode? rlen - nlen: rlen) >= reclen) break; |
617ba13b3 [PATCH] ext4: ren... |
1250 |
de = (struct ext4_dir_entry_2 *)((char *)de + rlen); |
ac27a0ec1 [PATCH] ext4: ini... |
1251 1252 1253 1254 1255 1256 |
offset += rlen; } if ((char *) de > top) return -ENOSPC; } BUFFER_TRACE(bh, "get_write_access"); |
617ba13b3 [PATCH] ext4: ren... |
1257 |
err = ext4_journal_get_write_access(handle, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1258 |
if (err) { |
617ba13b3 [PATCH] ext4: ren... |
1259 |
ext4_std_error(dir->i_sb, err); |
ac27a0ec1 [PATCH] ext4: ini... |
1260 1261 1262 1263 |
return err; } /* By now the buffer is marked for journaling */ |
617ba13b3 [PATCH] ext4: ren... |
1264 |
nlen = EXT4_DIR_REC_LEN(de->name_len); |
3d0518f47 ext4: New rec_len... |
1265 |
rlen = ext4_rec_len_from_disk(de->rec_len, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1266 |
if (de->inode) { |
617ba13b3 [PATCH] ext4: ren... |
1267 |
struct ext4_dir_entry_2 *de1 = (struct ext4_dir_entry_2 *)((char *)de + nlen); |
3d0518f47 ext4: New rec_len... |
1268 1269 |
de1->rec_len = ext4_rec_len_to_disk(rlen - nlen, blocksize); de->rec_len = ext4_rec_len_to_disk(nlen, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1270 1271 |
de = de1; } |
617ba13b3 [PATCH] ext4: ren... |
1272 |
de->file_type = EXT4_FT_UNKNOWN; |
ac27a0ec1 [PATCH] ext4: ini... |
1273 1274 |
if (inode) { de->inode = cpu_to_le32(inode->i_ino); |
617ba13b3 [PATCH] ext4: ren... |
1275 |
ext4_set_de_type(dir->i_sb, de, inode->i_mode); |
ac27a0ec1 [PATCH] ext4: ini... |
1276 1277 1278 |
} else de->inode = 0; de->name_len = namelen; |
af5bc92dd ext4: Fix whitesp... |
1279 |
memcpy(de->name, name, namelen); |
ac27a0ec1 [PATCH] ext4: ini... |
1280 1281 1282 1283 1284 1285 |
/* * 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 |
617ba13b3 [PATCH] ext4: ren... |
1286 |
* ext4_new_inode() setting the times, but error |
ac27a0ec1 [PATCH] ext4: ini... |
1287 1288 1289 1290 |
* 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. */ |
ef7f38359 ext4: Add nanosec... |
1291 |
dir->i_mtime = dir->i_ctime = ext4_current_time(dir); |
617ba13b3 [PATCH] ext4: ren... |
1292 |
ext4_update_dx_flag(dir); |
ac27a0ec1 [PATCH] ext4: ini... |
1293 |
dir->i_version++; |
617ba13b3 [PATCH] ext4: ren... |
1294 |
ext4_mark_inode_dirty(handle, dir); |
0390131ba ext4: Allow ext4 ... |
1295 1296 |
BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata"); err = ext4_handle_dirty_metadata(handle, dir, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1297 |
if (err) |
617ba13b3 [PATCH] ext4: ren... |
1298 |
ext4_std_error(dir->i_sb, err); |
ac27a0ec1 [PATCH] ext4: ini... |
1299 1300 |
return 0; } |
ac27a0ec1 [PATCH] ext4: ini... |
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 |
/* * 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; |
617ba13b3 [PATCH] ext4: ren... |
1315 |
struct ext4_dir_entry_2 *de, *de2; |
ac27a0ec1 [PATCH] ext4: ini... |
1316 1317 1318 1319 1320 |
char *data1, *top; unsigned len; int retval; unsigned blocksize; struct dx_hash_info hinfo; |
725d26d3f ext4: Introduce e... |
1321 |
ext4_lblk_t block; |
ac27a0ec1 [PATCH] ext4: ini... |
1322 1323 1324 |
struct fake_dirent *fde; blocksize = dir->i_sb->s_blocksize; |
e6b8bc09b ext4: Add sanity ... |
1325 1326 |
dxtrace(printk(KERN_DEBUG "Creating index: inode %lu ", dir->i_ino)); |
617ba13b3 [PATCH] ext4: ren... |
1327 |
retval = ext4_journal_get_write_access(handle, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1328 |
if (retval) { |
617ba13b3 [PATCH] ext4: ren... |
1329 |
ext4_std_error(dir->i_sb, retval); |
ac27a0ec1 [PATCH] ext4: ini... |
1330 1331 1332 1333 |
brelse(bh); return retval; } root = (struct dx_root *) bh->b_data; |
e6b8bc09b ext4: Add sanity ... |
1334 1335 1336 |
/* The 0th block becomes the root, move the dirents out */ fde = &root->dotdot; de = (struct ext4_dir_entry_2 *)((char *)fde + |
3d0518f47 ext4: New rec_len... |
1337 |
ext4_rec_len_from_disk(fde->rec_len, blocksize)); |
e6b8bc09b ext4: Add sanity ... |
1338 |
if ((char *) de >= (((char *) root) + blocksize)) { |
24676da46 ext4: Convert cal... |
1339 |
EXT4_ERROR_INODE(dir, "invalid rec_len for '..'"); |
e6b8bc09b ext4: Add sanity ... |
1340 1341 1342 1343 1344 1345 |
brelse(bh); return -EIO; } len = ((char *) root) + blocksize - (char *) de; /* Allocate new block for the 0th block's dirents */ |
af5bc92dd ext4: Fix whitesp... |
1346 |
bh2 = ext4_append(handle, dir, &block, &retval); |
ac27a0ec1 [PATCH] ext4: ini... |
1347 1348 1349 1350 |
if (!(bh2)) { brelse(bh); return retval; } |
12e9b8920 ext4: Use bitops ... |
1351 |
ext4_set_inode_flag(dir, EXT4_INODE_INDEX); |
ac27a0ec1 [PATCH] ext4: ini... |
1352 |
data1 = bh2->b_data; |
ac27a0ec1 [PATCH] ext4: ini... |
1353 |
memcpy (data1, de, len); |
617ba13b3 [PATCH] ext4: ren... |
1354 |
de = (struct ext4_dir_entry_2 *) data1; |
ac27a0ec1 [PATCH] ext4: ini... |
1355 |
top = data1 + len; |
3d0518f47 ext4: New rec_len... |
1356 |
while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top) |
ac27a0ec1 [PATCH] ext4: ini... |
1357 |
de = de2; |
3d0518f47 ext4: New rec_len... |
1358 1359 |
de->rec_len = ext4_rec_len_to_disk(data1 + blocksize - (char *) de, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1360 |
/* Initialize the root; the dot dirents already exist */ |
617ba13b3 [PATCH] ext4: ren... |
1361 |
de = (struct ext4_dir_entry_2 *) (&root->dotdot); |
3d0518f47 ext4: New rec_len... |
1362 1363 |
de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2), blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1364 1365 |
memset (&root->info, 0, sizeof(root->info)); root->info.info_length = sizeof(root->info); |
617ba13b3 [PATCH] ext4: ren... |
1366 |
root->info.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version; |
ac27a0ec1 [PATCH] ext4: ini... |
1367 |
entries = root->entries; |
af5bc92dd ext4: Fix whitesp... |
1368 1369 1370 |
dx_set_block(entries, 1); dx_set_count(entries, 1); dx_set_limit(entries, dx_root_limit(dir, sizeof(root->info))); |
ac27a0ec1 [PATCH] ext4: ini... |
1371 1372 1373 |
/* Initialize as for dx_probe */ hinfo.hash_version = root->info.hash_version; |
f99b25897 ext4: Add support... |
1374 1375 |
if (hinfo.hash_version <= DX_HASH_TEA) hinfo.hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned; |
617ba13b3 [PATCH] ext4: ren... |
1376 1377 |
hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed; ext4fs_dirhash(name, namelen, &hinfo); |
ac27a0ec1 [PATCH] ext4: ini... |
1378 1379 1380 1381 1382 |
frame = frames; frame->entries = entries; frame->at = entries; frame->bh = bh; bh = bh2; |
6976a6f2a ext4: don't deref... |
1383 1384 1385 |
ext4_handle_dirty_metadata(handle, dir, frame->bh); ext4_handle_dirty_metadata(handle, dir, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1386 |
de = do_split(handle,dir, &bh, frame, &hinfo, &retval); |
7ad8e4e6a ext4: Fix fs corr... |
1387 1388 1389 1390 1391 1392 1393 |
if (!de) { /* * Even if the block split failed, we have to properly write * out all the changes we did so far. Otherwise we can end up * with corrupted filesystem. */ ext4_mark_inode_dirty(handle, dir); |
7ad8e4e6a ext4: Fix fs corr... |
1394 |
dx_release(frames); |
ac27a0ec1 [PATCH] ext4: ini... |
1395 |
return retval; |
7ad8e4e6a ext4: Fix fs corr... |
1396 1397 |
} dx_release(frames); |
ac27a0ec1 [PATCH] ext4: ini... |
1398 |
|
2de770a40 ext4: fix potenti... |
1399 1400 1401 |
retval = add_dirent_to_buf(handle, dentry, inode, de, bh); brelse(bh); return retval; |
ac27a0ec1 [PATCH] ext4: ini... |
1402 |
} |
ac27a0ec1 [PATCH] ext4: ini... |
1403 1404 |
/* |
617ba13b3 [PATCH] ext4: ren... |
1405 |
* ext4_add_entry() |
ac27a0ec1 [PATCH] ext4: ini... |
1406 1407 |
* * adds a file entry to the specified directory, using the same |
617ba13b3 [PATCH] ext4: ren... |
1408 |
* semantics as ext4_find_entry(). It returns NULL if it failed. |
ac27a0ec1 [PATCH] ext4: ini... |
1409 1410 1411 1412 1413 |
* * 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. */ |
af5bc92dd ext4: Fix whitesp... |
1414 1415 |
static int ext4_add_entry(handle_t *handle, struct dentry *dentry, struct inode *inode) |
ac27a0ec1 [PATCH] ext4: ini... |
1416 1417 |
{ struct inode *dir = dentry->d_parent->d_inode; |
af5bc92dd ext4: Fix whitesp... |
1418 |
struct buffer_head *bh; |
617ba13b3 [PATCH] ext4: ren... |
1419 |
struct ext4_dir_entry_2 *de; |
af5bc92dd ext4: Fix whitesp... |
1420 |
struct super_block *sb; |
ac27a0ec1 [PATCH] ext4: ini... |
1421 |
int retval; |
ac27a0ec1 [PATCH] ext4: ini... |
1422 |
int dx_fallback=0; |
ac27a0ec1 [PATCH] ext4: ini... |
1423 |
unsigned blocksize; |
725d26d3f ext4: Introduce e... |
1424 |
ext4_lblk_t block, blocks; |
ac27a0ec1 [PATCH] ext4: ini... |
1425 1426 1427 1428 1429 |
sb = dir->i_sb; blocksize = sb->s_blocksize; if (!dentry->d_name.len) return -EINVAL; |
ac27a0ec1 [PATCH] ext4: ini... |
1430 |
if (is_dx(dir)) { |
617ba13b3 [PATCH] ext4: ren... |
1431 |
retval = ext4_dx_add_entry(handle, dentry, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1432 1433 |
if (!retval || (retval != ERR_BAD_DX_DIR)) return retval; |
12e9b8920 ext4: Use bitops ... |
1434 |
ext4_clear_inode_flag(dir, EXT4_INODE_INDEX); |
ac27a0ec1 [PATCH] ext4: ini... |
1435 |
dx_fallback++; |
617ba13b3 [PATCH] ext4: ren... |
1436 |
ext4_mark_inode_dirty(handle, dir); |
ac27a0ec1 [PATCH] ext4: ini... |
1437 |
} |
ac27a0ec1 [PATCH] ext4: ini... |
1438 |
blocks = dir->i_size >> sb->s_blocksize_bits; |
498e5f241 ext4: Change unsi... |
1439 |
for (block = 0; block < blocks; block++) { |
617ba13b3 [PATCH] ext4: ren... |
1440 |
bh = ext4_bread(handle, dir, block, 0, &retval); |
ac27a0ec1 [PATCH] ext4: ini... |
1441 1442 1443 |
if(!bh) return retval; retval = add_dirent_to_buf(handle, dentry, inode, NULL, bh); |
2de770a40 ext4: fix potenti... |
1444 1445 |
if (retval != -ENOSPC) { brelse(bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1446 |
return retval; |
2de770a40 ext4: fix potenti... |
1447 |
} |
ac27a0ec1 [PATCH] ext4: ini... |
1448 |
|
ac27a0ec1 [PATCH] ext4: ini... |
1449 |
if (blocks == 1 && !dx_fallback && |
1e424a348 ext4: partial rev... |
1450 1451 |
EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) return make_indexed_dir(handle, dentry, inode, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1452 1453 |
brelse(bh); } |
617ba13b3 [PATCH] ext4: ren... |
1454 |
bh = ext4_append(handle, dir, &block, &retval); |
ac27a0ec1 [PATCH] ext4: ini... |
1455 1456 |
if (!bh) return retval; |
617ba13b3 [PATCH] ext4: ren... |
1457 |
de = (struct ext4_dir_entry_2 *) bh->b_data; |
ac27a0ec1 [PATCH] ext4: ini... |
1458 |
de->inode = 0; |
3d0518f47 ext4: New rec_len... |
1459 |
de->rec_len = ext4_rec_len_to_disk(blocksize, blocksize); |
2de770a40 ext4: fix potenti... |
1460 1461 |
retval = add_dirent_to_buf(handle, dentry, inode, de, bh); brelse(bh); |
14ece1028 ext4: Make fsync ... |
1462 1463 |
if (retval == 0) ext4_set_inode_state(inode, EXT4_STATE_NEWENTRY); |
2de770a40 ext4: fix potenti... |
1464 |
return retval; |
ac27a0ec1 [PATCH] ext4: ini... |
1465 |
} |
ac27a0ec1 [PATCH] ext4: ini... |
1466 1467 1468 |
/* * Returns 0 for success, or a negative error value */ |
617ba13b3 [PATCH] ext4: ren... |
1469 |
static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry, |
ac27a0ec1 [PATCH] ext4: ini... |
1470 1471 1472 1473 1474 |
struct inode *inode) { struct dx_frame frames[2], *frame; struct dx_entry *entries, *at; struct dx_hash_info hinfo; |
af5bc92dd ext4: Fix whitesp... |
1475 |
struct buffer_head *bh; |
ac27a0ec1 [PATCH] ext4: ini... |
1476 |
struct inode *dir = dentry->d_parent->d_inode; |
af5bc92dd ext4: Fix whitesp... |
1477 |
struct super_block *sb = dir->i_sb; |
617ba13b3 [PATCH] ext4: ren... |
1478 |
struct ext4_dir_entry_2 *de; |
ac27a0ec1 [PATCH] ext4: ini... |
1479 |
int err; |
f702ba0fd ext4: Don't use '... |
1480 |
frame = dx_probe(&dentry->d_name, dir, &hinfo, frames, &err); |
ac27a0ec1 [PATCH] ext4: ini... |
1481 1482 1483 1484 |
if (!frame) return err; entries = frame->entries; at = frame->at; |
617ba13b3 [PATCH] ext4: ren... |
1485 |
if (!(bh = ext4_bread(handle,dir, dx_get_block(frame->at), 0, &err))) |
ac27a0ec1 [PATCH] ext4: ini... |
1486 1487 1488 |
goto cleanup; BUFFER_TRACE(bh, "get_write_access"); |
617ba13b3 [PATCH] ext4: ren... |
1489 |
err = ext4_journal_get_write_access(handle, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1490 1491 1492 1493 |
if (err) goto journal_error; err = add_dirent_to_buf(handle, dentry, inode, NULL, bh); |
2de770a40 ext4: fix potenti... |
1494 |
if (err != -ENOSPC) |
ac27a0ec1 [PATCH] ext4: ini... |
1495 |
goto cleanup; |
ac27a0ec1 [PATCH] ext4: ini... |
1496 1497 |
/* Block full, should compress but for now just split */ |
4776004f5 ext4: Add printk ... |
1498 1499 |
dxtrace(printk(KERN_DEBUG "using %u of %u node entries ", |
ac27a0ec1 [PATCH] ext4: ini... |
1500 1501 1502 |
dx_get_count(entries), dx_get_limit(entries))); /* Need to split index? */ if (dx_get_count(entries) == dx_get_limit(entries)) { |
725d26d3f ext4: Introduce e... |
1503 |
ext4_lblk_t newblock; |
ac27a0ec1 [PATCH] ext4: ini... |
1504 1505 1506 1507 1508 1509 1510 1511 |
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))) { |
12062dddd ext4: move __func... |
1512 |
ext4_warning(sb, "Directory index full!"); |
ac27a0ec1 [PATCH] ext4: ini... |
1513 1514 1515 |
err = -ENOSPC; goto cleanup; } |
617ba13b3 [PATCH] ext4: ren... |
1516 |
bh2 = ext4_append (handle, dir, &newblock, &err); |
ac27a0ec1 [PATCH] ext4: ini... |
1517 1518 1519 1520 |
if (!(bh2)) goto cleanup; node2 = (struct dx_node *)(bh2->b_data); entries2 = node2->entries; |
1f7bebb9e ext4: Always set ... |
1521 |
memset(&node2->fake, 0, sizeof(struct fake_dirent)); |
3d0518f47 ext4: New rec_len... |
1522 1523 |
node2->fake.rec_len = ext4_rec_len_to_disk(sb->s_blocksize, sb->s_blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1524 |
BUFFER_TRACE(frame->bh, "get_write_access"); |
617ba13b3 [PATCH] ext4: ren... |
1525 |
err = ext4_journal_get_write_access(handle, frame->bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1526 1527 1528 1529 1530 |
if (err) goto journal_error; if (levels) { unsigned icount1 = icount/2, icount2 = icount - icount1; unsigned hash2 = dx_get_hash(entries + icount1); |
4776004f5 ext4: Add printk ... |
1531 1532 1533 |
dxtrace(printk(KERN_DEBUG "Split index %i/%i ", icount1, icount2)); |
ac27a0ec1 [PATCH] ext4: ini... |
1534 1535 |
BUFFER_TRACE(frame->bh, "get_write_access"); /* index root */ |
617ba13b3 [PATCH] ext4: ren... |
1536 |
err = ext4_journal_get_write_access(handle, |
ac27a0ec1 [PATCH] ext4: ini... |
1537 1538 1539 |
frames[0].bh); if (err) goto journal_error; |
af5bc92dd ext4: Fix whitesp... |
1540 1541 1542 1543 1544 |
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)); |
ac27a0ec1 [PATCH] ext4: ini... |
1545 1546 1547 1548 1549 1550 1551 |
/* 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); } |
af5bc92dd ext4: Fix whitesp... |
1552 1553 1554 |
dx_insert_block(frames + 0, hash2, newblock); dxtrace(dx_show_index("node", frames[1].entries)); dxtrace(dx_show_index("node", |
ac27a0ec1 [PATCH] ext4: ini... |
1555 |
((struct dx_node *) bh2->b_data)->entries)); |
5930ea643 ext4: call ext4_h... |
1556 |
err = ext4_handle_dirty_metadata(handle, dir, bh2); |
ac27a0ec1 [PATCH] ext4: ini... |
1557 1558 1559 1560 |
if (err) goto journal_error; brelse (bh2); } else { |
4776004f5 ext4: Add printk ... |
1561 1562 1563 |
dxtrace(printk(KERN_DEBUG "Creating second level index... ")); |
ac27a0ec1 [PATCH] ext4: ini... |
1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 |
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; |
617ba13b3 [PATCH] ext4: ren... |
1578 |
err = ext4_journal_get_write_access(handle, |
ac27a0ec1 [PATCH] ext4: ini... |
1579 1580 1581 1582 |
frame->bh); if (err) goto journal_error; } |
5930ea643 ext4: call ext4_h... |
1583 |
err = ext4_handle_dirty_metadata(handle, dir, frames[0].bh); |
b40971426 ext4: add error c... |
1584 1585 1586 1587 |
if (err) { ext4_std_error(inode->i_sb, err); goto cleanup; } |
ac27a0ec1 [PATCH] ext4: ini... |
1588 1589 1590 1591 1592 |
} de = do_split(handle, dir, &bh, frame, &hinfo, &err); if (!de) goto cleanup; err = add_dirent_to_buf(handle, dentry, inode, de, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1593 1594 1595 |
goto cleanup; journal_error: |
617ba13b3 [PATCH] ext4: ren... |
1596 |
ext4_std_error(dir->i_sb, err); |
ac27a0ec1 [PATCH] ext4: ini... |
1597 1598 1599 1600 1601 1602 |
cleanup: if (bh) brelse(bh); dx_release(frames); return err; } |
ac27a0ec1 [PATCH] ext4: ini... |
1603 1604 |
/* |
617ba13b3 [PATCH] ext4: ren... |
1605 |
* ext4_delete_entry deletes a directory entry by merging it with the |
ac27a0ec1 [PATCH] ext4: ini... |
1606 1607 |
* previous entry */ |
af5bc92dd ext4: Fix whitesp... |
1608 1609 1610 1611 |
static int ext4_delete_entry(handle_t *handle, struct inode *dir, struct ext4_dir_entry_2 *de_del, struct buffer_head *bh) |
ac27a0ec1 [PATCH] ext4: ini... |
1612 |
{ |
af5bc92dd ext4: Fix whitesp... |
1613 |
struct ext4_dir_entry_2 *de, *pde; |
3d0518f47 ext4: New rec_len... |
1614 |
unsigned int blocksize = dir->i_sb->s_blocksize; |
b40971426 ext4: add error c... |
1615 |
int i, err; |
ac27a0ec1 [PATCH] ext4: ini... |
1616 1617 1618 |
i = 0; pde = NULL; |
617ba13b3 [PATCH] ext4: ren... |
1619 |
de = (struct ext4_dir_entry_2 *) bh->b_data; |
ac27a0ec1 [PATCH] ext4: ini... |
1620 |
while (i < bh->b_size) { |
f7c21177a ext4: Use ext4_er... |
1621 |
if (ext4_check_dir_entry(dir, NULL, de, bh, i)) |
ac27a0ec1 [PATCH] ext4: ini... |
1622 1623 1624 |
return -EIO; if (de == de_del) { BUFFER_TRACE(bh, "get_write_access"); |
b40971426 ext4: add error c... |
1625 1626 1627 1628 1629 |
err = ext4_journal_get_write_access(handle, bh); if (unlikely(err)) { ext4_std_error(dir->i_sb, err); return err; } |
ac27a0ec1 [PATCH] ext4: ini... |
1630 |
if (pde) |
a72d7f834 ext4: Avoid rec_l... |
1631 |
pde->rec_len = ext4_rec_len_to_disk( |
3d0518f47 ext4: New rec_len... |
1632 1633 1634 1635 1636 |
ext4_rec_len_from_disk(pde->rec_len, blocksize) + ext4_rec_len_from_disk(de->rec_len, blocksize), blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1637 1638 1639 |
else de->inode = 0; dir->i_version++; |
0390131ba ext4: Allow ext4 ... |
1640 |
BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata"); |
b40971426 ext4: add error c... |
1641 1642 1643 1644 1645 |
err = ext4_handle_dirty_metadata(handle, dir, bh); if (unlikely(err)) { ext4_std_error(dir->i_sb, err); return err; } |
ac27a0ec1 [PATCH] ext4: ini... |
1646 1647 |
return 0; } |
3d0518f47 ext4: New rec_len... |
1648 |
i += ext4_rec_len_from_disk(de->rec_len, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1649 |
pde = de; |
3d0518f47 ext4: New rec_len... |
1650 |
de = ext4_next_entry(de, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1651 1652 1653 |
} return -ENOENT; } |
f8628a14a ext4: Remove 6500... |
1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 |
/* * DIR_NLINK feature is set if 1) nlinks > EXT4_LINK_MAX or 2) nlinks == 2, * since this indicates that nlinks count was previously 1. */ static void ext4_inc_count(handle_t *handle, struct inode *inode) { inc_nlink(inode); if (is_dx(inode) && inode->i_nlink > 1) { /* limit is 16-bit i_links_count */ if (inode->i_nlink >= EXT4_LINK_MAX || inode->i_nlink == 2) { |
bfe868486 filesystems: add ... |
1664 |
set_nlink(inode, 1); |
f8628a14a ext4: Remove 6500... |
1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 |
EXT4_SET_RO_COMPAT_FEATURE(inode->i_sb, EXT4_FEATURE_RO_COMPAT_DIR_NLINK); } } } /* * If a directory had nlink == 1, then we should let it be 1. This indicates * directory has >EXT4_LINK_MAX subdirs. */ static void ext4_dec_count(handle_t *handle, struct inode *inode) { |
909a4cf1f ext4: avoid setti... |
1677 1678 |
if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2) drop_nlink(inode); |
f8628a14a ext4: Remove 6500... |
1679 |
} |
617ba13b3 [PATCH] ext4: ren... |
1680 |
static int ext4_add_nondir(handle_t *handle, |
ac27a0ec1 [PATCH] ext4: ini... |
1681 1682 |
struct dentry *dentry, struct inode *inode) { |
617ba13b3 [PATCH] ext4: ren... |
1683 |
int err = ext4_add_entry(handle, dentry, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1684 |
if (!err) { |
617ba13b3 [PATCH] ext4: ren... |
1685 |
ext4_mark_inode_dirty(handle, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1686 |
d_instantiate(dentry, inode); |
6b38e842b nfsd race fixes: ... |
1687 |
unlock_new_inode(inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1688 1689 |
return 0; } |
731b9a549 [PATCH] remove ex... |
1690 |
drop_nlink(inode); |
6b38e842b nfsd race fixes: ... |
1691 |
unlock_new_inode(inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 |
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 * with d_instantiate(). */ |
4acdaf27e switch ->create()... |
1704 |
static int ext4_create(struct inode *dir, struct dentry *dentry, umode_t mode, |
af5bc92dd ext4: Fix whitesp... |
1705 |
struct nameidata *nd) |
ac27a0ec1 [PATCH] ext4: ini... |
1706 1707 |
{ handle_t *handle; |
af5bc92dd ext4: Fix whitesp... |
1708 |
struct inode *inode; |
ac27a0ec1 [PATCH] ext4: ini... |
1709 |
int err, retries = 0; |
871a29315 dquot: cleanup dq... |
1710 |
dquot_initialize(dir); |
907f4554e dquot: move dquot... |
1711 |
|
ac27a0ec1 [PATCH] ext4: ini... |
1712 |
retry: |
617ba13b3 [PATCH] ext4: ren... |
1713 1714 |
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 + |
5aca07eb7 ext4: quota macro... |
1715 |
EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb)); |
ac27a0ec1 [PATCH] ext4: ini... |
1716 1717 1718 1719 |
if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(dir)) |
0390131ba ext4: Allow ext4 ... |
1720 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
1721 |
|
5cb81dabc ext4: fix quota a... |
1722 |
inode = ext4_new_inode(handle, dir, mode, &dentry->d_name, 0, NULL); |
ac27a0ec1 [PATCH] ext4: ini... |
1723 1724 |
err = PTR_ERR(inode); if (!IS_ERR(inode)) { |
617ba13b3 [PATCH] ext4: ren... |
1725 1726 1727 1728 |
inode->i_op = &ext4_file_inode_operations; inode->i_fop = &ext4_file_operations; ext4_set_aops(inode); err = ext4_add_nondir(handle, dentry, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1729 |
} |
617ba13b3 [PATCH] ext4: ren... |
1730 1731 |
ext4_journal_stop(handle); if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) |
ac27a0ec1 [PATCH] ext4: ini... |
1732 1733 1734 |
goto retry; return err; } |
af5bc92dd ext4: Fix whitesp... |
1735 |
static int ext4_mknod(struct inode *dir, struct dentry *dentry, |
1a67aafb5 switch ->mknod() ... |
1736 |
umode_t mode, dev_t rdev) |
ac27a0ec1 [PATCH] ext4: ini... |
1737 1738 1739 1740 1741 1742 1743 |
{ handle_t *handle; struct inode *inode; int err, retries = 0; if (!new_valid_dev(rdev)) return -EINVAL; |
871a29315 dquot: cleanup dq... |
1744 |
dquot_initialize(dir); |
907f4554e dquot: move dquot... |
1745 |
|
ac27a0ec1 [PATCH] ext4: ini... |
1746 |
retry: |
617ba13b3 [PATCH] ext4: ren... |
1747 1748 |
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 + |
5aca07eb7 ext4: quota macro... |
1749 |
EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb)); |
ac27a0ec1 [PATCH] ext4: ini... |
1750 1751 1752 1753 |
if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(dir)) |
0390131ba ext4: Allow ext4 ... |
1754 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
1755 |
|
5cb81dabc ext4: fix quota a... |
1756 |
inode = ext4_new_inode(handle, dir, mode, &dentry->d_name, 0, NULL); |
ac27a0ec1 [PATCH] ext4: ini... |
1757 1758 1759 |
err = PTR_ERR(inode); if (!IS_ERR(inode)) { init_special_inode(inode, inode->i_mode, rdev); |
03010a335 ext4: Rename ext4... |
1760 |
#ifdef CONFIG_EXT4_FS_XATTR |
617ba13b3 [PATCH] ext4: ren... |
1761 |
inode->i_op = &ext4_special_inode_operations; |
ac27a0ec1 [PATCH] ext4: ini... |
1762 |
#endif |
617ba13b3 [PATCH] ext4: ren... |
1763 |
err = ext4_add_nondir(handle, dentry, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1764 |
} |
617ba13b3 [PATCH] ext4: ren... |
1765 1766 |
ext4_journal_stop(handle); if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) |
ac27a0ec1 [PATCH] ext4: ini... |
1767 1768 1769 |
goto retry; return err; } |
18bb1db3e switch vfs_mkdir(... |
1770 |
static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) |
ac27a0ec1 [PATCH] ext4: ini... |
1771 1772 |
{ handle_t *handle; |
af5bc92dd ext4: Fix whitesp... |
1773 |
struct inode *inode; |
dabd991f9 ext4: add more er... |
1774 |
struct buffer_head *dir_block = NULL; |
af5bc92dd ext4: Fix whitesp... |
1775 |
struct ext4_dir_entry_2 *de; |
3d0518f47 ext4: New rec_len... |
1776 |
unsigned int blocksize = dir->i_sb->s_blocksize; |
ac27a0ec1 [PATCH] ext4: ini... |
1777 |
int err, retries = 0; |
f8628a14a ext4: Remove 6500... |
1778 |
if (EXT4_DIR_LINK_MAX(dir)) |
ac27a0ec1 [PATCH] ext4: ini... |
1779 |
return -EMLINK; |
871a29315 dquot: cleanup dq... |
1780 |
dquot_initialize(dir); |
907f4554e dquot: move dquot... |
1781 |
|
ac27a0ec1 [PATCH] ext4: ini... |
1782 |
retry: |
617ba13b3 [PATCH] ext4: ren... |
1783 1784 |
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 + |
5aca07eb7 ext4: quota macro... |
1785 |
EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb)); |
ac27a0ec1 [PATCH] ext4: ini... |
1786 1787 1788 1789 |
if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(dir)) |
0390131ba ext4: Allow ext4 ... |
1790 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
1791 |
|
11013911d ext4: teach the i... |
1792 |
inode = ext4_new_inode(handle, dir, S_IFDIR | mode, |
5cb81dabc ext4: fix quota a... |
1793 |
&dentry->d_name, 0, NULL); |
ac27a0ec1 [PATCH] ext4: ini... |
1794 1795 1796 |
err = PTR_ERR(inode); if (IS_ERR(inode)) goto out_stop; |
617ba13b3 [PATCH] ext4: ren... |
1797 1798 1799 |
inode->i_op = &ext4_dir_inode_operations; inode->i_fop = &ext4_dir_operations; inode->i_size = EXT4_I(inode)->i_disksize = inode->i_sb->s_blocksize; |
af5bc92dd ext4: Fix whitesp... |
1800 |
dir_block = ext4_bread(handle, inode, 0, 1, &err); |
4cdeed861 ext4: Don't leave... |
1801 1802 |
if (!dir_block) goto out_clear_inode; |
ac27a0ec1 [PATCH] ext4: ini... |
1803 |
BUFFER_TRACE(dir_block, "get_write_access"); |
dabd991f9 ext4: add more er... |
1804 1805 1806 |
err = ext4_journal_get_write_access(handle, dir_block); if (err) goto out_clear_inode; |
617ba13b3 [PATCH] ext4: ren... |
1807 |
de = (struct ext4_dir_entry_2 *) dir_block->b_data; |
ac27a0ec1 [PATCH] ext4: ini... |
1808 1809 |
de->inode = cpu_to_le32(inode->i_ino); de->name_len = 1; |
3d0518f47 ext4: New rec_len... |
1810 1811 |
de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len), blocksize); |
af5bc92dd ext4: Fix whitesp... |
1812 |
strcpy(de->name, "."); |
617ba13b3 [PATCH] ext4: ren... |
1813 |
ext4_set_de_type(dir->i_sb, de, S_IFDIR); |
3d0518f47 ext4: New rec_len... |
1814 |
de = ext4_next_entry(de, blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1815 |
de->inode = cpu_to_le32(dir->i_ino); |
3d0518f47 ext4: New rec_len... |
1816 1817 |
de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(1), blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1818 |
de->name_len = 2; |
af5bc92dd ext4: Fix whitesp... |
1819 |
strcpy(de->name, ".."); |
617ba13b3 [PATCH] ext4: ren... |
1820 |
ext4_set_de_type(dir->i_sb, de, S_IFDIR); |
bfe868486 filesystems: add ... |
1821 |
set_nlink(inode, 2); |
0390131ba ext4: Allow ext4 ... |
1822 |
BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata"); |
f9287c1f2 ext4: ext4_mkdir ... |
1823 |
err = ext4_handle_dirty_metadata(handle, inode, dir_block); |
dabd991f9 ext4: add more er... |
1824 1825 1826 1827 1828 |
if (err) goto out_clear_inode; err = ext4_mark_inode_dirty(handle, inode); if (!err) err = ext4_add_entry(handle, dentry, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1829 |
if (err) { |
4cdeed861 ext4: Don't leave... |
1830 1831 |
out_clear_inode: clear_nlink(inode); |
6b38e842b nfsd race fixes: ... |
1832 |
unlock_new_inode(inode); |
617ba13b3 [PATCH] ext4: ren... |
1833 |
ext4_mark_inode_dirty(handle, inode); |
af5bc92dd ext4: Fix whitesp... |
1834 |
iput(inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1835 1836 |
goto out_stop; } |
f8628a14a ext4: Remove 6500... |
1837 |
ext4_inc_count(handle, dir); |
617ba13b3 [PATCH] ext4: ren... |
1838 |
ext4_update_dx_flag(dir); |
dabd991f9 ext4: add more er... |
1839 1840 1841 |
err = ext4_mark_inode_dirty(handle, dir); if (err) goto out_clear_inode; |
ac27a0ec1 [PATCH] ext4: ini... |
1842 |
d_instantiate(dentry, inode); |
6b38e842b nfsd race fixes: ... |
1843 |
unlock_new_inode(inode); |
ac27a0ec1 [PATCH] ext4: ini... |
1844 |
out_stop: |
dabd991f9 ext4: add more er... |
1845 |
brelse(dir_block); |
617ba13b3 [PATCH] ext4: ren... |
1846 1847 |
ext4_journal_stop(handle); if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) |
ac27a0ec1 [PATCH] ext4: ini... |
1848 1849 1850 1851 1852 1853 1854 |
goto retry; return err; } /* * routine to check that the specified directory is empty (for rmdir) */ |
af5bc92dd ext4: Fix whitesp... |
1855 |
static int empty_dir(struct inode *inode) |
ac27a0ec1 [PATCH] ext4: ini... |
1856 |
{ |
498e5f241 ext4: Change unsi... |
1857 |
unsigned int offset; |
af5bc92dd ext4: Fix whitesp... |
1858 1859 1860 |
struct buffer_head *bh; struct ext4_dir_entry_2 *de, *de1; struct super_block *sb; |
ac27a0ec1 [PATCH] ext4: ini... |
1861 1862 1863 |
int err = 0; sb = inode->i_sb; |
617ba13b3 [PATCH] ext4: ren... |
1864 |
if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2) || |
af5bc92dd ext4: Fix whitesp... |
1865 |
!(bh = ext4_bread(NULL, inode, 0, 0, &err))) { |
ac27a0ec1 [PATCH] ext4: ini... |
1866 |
if (err) |
24676da46 ext4: Convert cal... |
1867 1868 |
EXT4_ERROR_INODE(inode, "error %d reading directory lblock 0", err); |
ac27a0ec1 [PATCH] ext4: ini... |
1869 |
else |
12062dddd ext4: move __func... |
1870 |
ext4_warning(inode->i_sb, |
ac27a0ec1 [PATCH] ext4: ini... |
1871 1872 1873 1874 |
"bad directory (dir #%lu) - no data block", inode->i_ino); return 1; } |
617ba13b3 [PATCH] ext4: ren... |
1875 |
de = (struct ext4_dir_entry_2 *) bh->b_data; |
3d0518f47 ext4: New rec_len... |
1876 |
de1 = ext4_next_entry(de, sb->s_blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1877 1878 |
if (le32_to_cpu(de->inode) != inode->i_ino || !le32_to_cpu(de1->inode) || |
af5bc92dd ext4: Fix whitesp... |
1879 1880 |
strcmp(".", de->name) || strcmp("..", de1->name)) { |
12062dddd ext4: move __func... |
1881 |
ext4_warning(inode->i_sb, |
af5bc92dd ext4: Fix whitesp... |
1882 1883 1884 |
"bad directory (dir #%lu) - no `.' or `..'", inode->i_ino); brelse(bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1885 1886 |
return 1; } |
3d0518f47 ext4: New rec_len... |
1887 1888 1889 |
offset = ext4_rec_len_from_disk(de->rec_len, sb->s_blocksize) + ext4_rec_len_from_disk(de1->rec_len, sb->s_blocksize); de = ext4_next_entry(de1, sb->s_blocksize); |
af5bc92dd ext4: Fix whitesp... |
1890 |
while (offset < inode->i_size) { |
ac27a0ec1 [PATCH] ext4: ini... |
1891 |
if (!bh || |
24676da46 ext4: Convert cal... |
1892 1893 |
(void *) de >= (void *) (bh->b_data+sb->s_blocksize)) { unsigned int lblock; |
ac27a0ec1 [PATCH] ext4: ini... |
1894 |
err = 0; |
af5bc92dd ext4: Fix whitesp... |
1895 |
brelse(bh); |
24676da46 ext4: Convert cal... |
1896 1897 |
lblock = offset >> EXT4_BLOCK_SIZE_BITS(sb); bh = ext4_bread(NULL, inode, lblock, 0, &err); |
ac27a0ec1 [PATCH] ext4: ini... |
1898 1899 |
if (!bh) { if (err) |
24676da46 ext4: Convert cal... |
1900 1901 1902 |
EXT4_ERROR_INODE(inode, "error %d reading directory " "lblock %u", err, lblock); |
ac27a0ec1 [PATCH] ext4: ini... |
1903 1904 1905 |
offset += sb->s_blocksize; continue; } |
617ba13b3 [PATCH] ext4: ren... |
1906 |
de = (struct ext4_dir_entry_2 *) bh->b_data; |
ac27a0ec1 [PATCH] ext4: ini... |
1907 |
} |
f7c21177a ext4: Use ext4_er... |
1908 |
if (ext4_check_dir_entry(inode, NULL, de, bh, offset)) { |
617ba13b3 [PATCH] ext4: ren... |
1909 |
de = (struct ext4_dir_entry_2 *)(bh->b_data + |
ac27a0ec1 [PATCH] ext4: ini... |
1910 1911 1912 1913 1914 |
sb->s_blocksize); offset = (offset | (sb->s_blocksize - 1)) + 1; continue; } if (le32_to_cpu(de->inode)) { |
af5bc92dd ext4: Fix whitesp... |
1915 |
brelse(bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1916 1917 |
return 0; } |
3d0518f47 ext4: New rec_len... |
1918 1919 |
offset += ext4_rec_len_from_disk(de->rec_len, sb->s_blocksize); de = ext4_next_entry(de, sb->s_blocksize); |
ac27a0ec1 [PATCH] ext4: ini... |
1920 |
} |
af5bc92dd ext4: Fix whitesp... |
1921 |
brelse(bh); |
ac27a0ec1 [PATCH] ext4: ini... |
1922 1923 |
return 1; } |
617ba13b3 [PATCH] ext4: ren... |
1924 |
/* ext4_orphan_add() links an unlinked or truncated inode into a list of |
ac27a0ec1 [PATCH] ext4: ini... |
1925 1926 1927 1928 1929 |
* 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 |
617ba13b3 [PATCH] ext4: ren... |
1930 |
* inodes and truncating linked inodes in ext4_orphan_cleanup(). |
ac27a0ec1 [PATCH] ext4: ini... |
1931 |
*/ |
617ba13b3 [PATCH] ext4: ren... |
1932 |
int ext4_orphan_add(handle_t *handle, struct inode *inode) |
ac27a0ec1 [PATCH] ext4: ini... |
1933 1934 |
{ struct super_block *sb = inode->i_sb; |
617ba13b3 [PATCH] ext4: ren... |
1935 |
struct ext4_iloc iloc; |
ac27a0ec1 [PATCH] ext4: ini... |
1936 |
int err = 0, rc; |
0390131ba ext4: Allow ext4 ... |
1937 1938 |
if (!ext4_handle_valid(handle)) return 0; |
3b9d4ed26 ext4: Replace loc... |
1939 |
mutex_lock(&EXT4_SB(sb)->s_orphan_lock); |
617ba13b3 [PATCH] ext4: ren... |
1940 |
if (!list_empty(&EXT4_I(inode)->i_orphan)) |
ac27a0ec1 [PATCH] ext4: ini... |
1941 |
goto out_unlock; |
afb86178c ext4: remove unne... |
1942 1943 1944 1945 1946 |
/* * Orphan handling is only valid for files with data blocks * being truncated, or files being unlinked. Note that we either * hold i_mutex, or the inode can not be referenced from outside, * so i_nlink should not be bumped due to race |
ac27a0ec1 [PATCH] ext4: ini... |
1947 |
*/ |
af5bc92dd ext4: Fix whitesp... |
1948 1949 |
J_ASSERT((S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) || inode->i_nlink == 0); |
ac27a0ec1 [PATCH] ext4: ini... |
1950 |
|
617ba13b3 [PATCH] ext4: ren... |
1951 1952 |
BUFFER_TRACE(EXT4_SB(sb)->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, EXT4_SB(sb)->s_sbh); |
ac27a0ec1 [PATCH] ext4: ini... |
1953 1954 |
if (err) goto out_unlock; |
617ba13b3 [PATCH] ext4: ren... |
1955 |
err = ext4_reserve_inode_write(handle, inode, &iloc); |
ac27a0ec1 [PATCH] ext4: ini... |
1956 1957 |
if (err) goto out_unlock; |
6e3617e57 ext4: Handle non ... |
1958 1959 1960 1961 1962 1963 1964 |
/* * Due to previous errors inode may be already a part of on-disk * orphan list. If so skip on-disk list modification. */ if (NEXT_ORPHAN(inode) && NEXT_ORPHAN(inode) <= (le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count))) goto mem_insert; |
ac27a0ec1 [PATCH] ext4: ini... |
1965 1966 |
/* Insert this inode at the head of the on-disk orphan list... */ |
617ba13b3 [PATCH] ext4: ren... |
1967 1968 |
NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan); EXT4_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino); |
73b50c1c9 ext4: Fix BUG_ON ... |
1969 |
err = ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh); |
617ba13b3 [PATCH] ext4: ren... |
1970 |
rc = ext4_mark_iloc_dirty(handle, inode, &iloc); |
ac27a0ec1 [PATCH] ext4: ini... |
1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 |
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. */ |
6e3617e57 ext4: Handle non ... |
1982 |
mem_insert: |
ac27a0ec1 [PATCH] ext4: ini... |
1983 |
if (!err) |
617ba13b3 [PATCH] ext4: ren... |
1984 |
list_add(&EXT4_I(inode)->i_orphan, &EXT4_SB(sb)->s_orphan); |
ac27a0ec1 [PATCH] ext4: ini... |
1985 1986 1987 1988 1989 1990 1991 |
jbd_debug(4, "superblock will point to %lu ", inode->i_ino); jbd_debug(4, "orphan inode %lu will point to %d ", inode->i_ino, NEXT_ORPHAN(inode)); out_unlock: |
3b9d4ed26 ext4: Replace loc... |
1992 |
mutex_unlock(&EXT4_SB(sb)->s_orphan_lock); |
617ba13b3 [PATCH] ext4: ren... |
1993 |
ext4_std_error(inode->i_sb, err); |
ac27a0ec1 [PATCH] ext4: ini... |
1994 1995 1996 1997 |
return err; } /* |
617ba13b3 [PATCH] ext4: ren... |
1998 |
* ext4_orphan_del() removes an unlinked or truncated inode from the list |
ac27a0ec1 [PATCH] ext4: ini... |
1999 2000 |
* of such inodes stored on disk, because it is finally being cleaned up. */ |
617ba13b3 [PATCH] ext4: ren... |
2001 |
int ext4_orphan_del(handle_t *handle, struct inode *inode) |
ac27a0ec1 [PATCH] ext4: ini... |
2002 2003 |
{ struct list_head *prev; |
617ba13b3 [PATCH] ext4: ren... |
2004 2005 |
struct ext4_inode_info *ei = EXT4_I(inode); struct ext4_sb_info *sbi; |
498e5f241 ext4: Change unsi... |
2006 |
__u32 ino_next; |
617ba13b3 [PATCH] ext4: ren... |
2007 |
struct ext4_iloc iloc; |
ac27a0ec1 [PATCH] ext4: ini... |
2008 |
int err = 0; |
d3d1faf6a ext4: Handle nest... |
2009 2010 |
/* ext4_handle_valid() assumes a valid handle_t pointer */ if (handle && !ext4_handle_valid(handle)) |
0390131ba ext4: Allow ext4 ... |
2011 |
return 0; |
3b9d4ed26 ext4: Replace loc... |
2012 2013 2014 |
mutex_lock(&EXT4_SB(inode->i_sb)->s_orphan_lock); if (list_empty(&ei->i_orphan)) goto out; |
ac27a0ec1 [PATCH] ext4: ini... |
2015 2016 2017 |
ino_next = NEXT_ORPHAN(inode); prev = ei->i_orphan.prev; |
617ba13b3 [PATCH] ext4: ren... |
2018 |
sbi = EXT4_SB(inode->i_sb); |
ac27a0ec1 [PATCH] ext4: ini... |
2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 |
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. */ |
0390131ba ext4: Allow ext4 ... |
2029 |
if (sbi->s_journal && !handle) |
ac27a0ec1 [PATCH] ext4: ini... |
2030 |
goto out; |
617ba13b3 [PATCH] ext4: ren... |
2031 |
err = ext4_reserve_inode_write(handle, inode, &iloc); |
ac27a0ec1 [PATCH] ext4: ini... |
2032 2033 2034 2035 |
if (err) goto out_err; if (prev == &sbi->s_orphan) { |
498e5f241 ext4: Change unsi... |
2036 2037 |
jbd_debug(4, "superblock will point to %u ", ino_next); |
ac27a0ec1 [PATCH] ext4: ini... |
2038 |
BUFFER_TRACE(sbi->s_sbh, "get_write_access"); |
617ba13b3 [PATCH] ext4: ren... |
2039 |
err = ext4_journal_get_write_access(handle, sbi->s_sbh); |
ac27a0ec1 [PATCH] ext4: ini... |
2040 2041 2042 |
if (err) goto out_brelse; sbi->s_es->s_last_orphan = cpu_to_le32(ino_next); |
73b50c1c9 ext4: Fix BUG_ON ... |
2043 |
err = ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh); |
ac27a0ec1 [PATCH] ext4: ini... |
2044 |
} else { |
617ba13b3 [PATCH] ext4: ren... |
2045 |
struct ext4_iloc iloc2; |
ac27a0ec1 [PATCH] ext4: ini... |
2046 |
struct inode *i_prev = |
617ba13b3 [PATCH] ext4: ren... |
2047 |
&list_entry(prev, struct ext4_inode_info, i_orphan)->vfs_inode; |
ac27a0ec1 [PATCH] ext4: ini... |
2048 |
|
498e5f241 ext4: Change unsi... |
2049 2050 |
jbd_debug(4, "orphan inode %lu will point to %u ", |
ac27a0ec1 [PATCH] ext4: ini... |
2051 |
i_prev->i_ino, ino_next); |
617ba13b3 [PATCH] ext4: ren... |
2052 |
err = ext4_reserve_inode_write(handle, i_prev, &iloc2); |
ac27a0ec1 [PATCH] ext4: ini... |
2053 2054 2055 |
if (err) goto out_brelse; NEXT_ORPHAN(i_prev) = ino_next; |
617ba13b3 [PATCH] ext4: ren... |
2056 |
err = ext4_mark_iloc_dirty(handle, i_prev, &iloc2); |
ac27a0ec1 [PATCH] ext4: ini... |
2057 2058 2059 2060 |
} if (err) goto out_brelse; NEXT_ORPHAN(inode) = 0; |
617ba13b3 [PATCH] ext4: ren... |
2061 |
err = ext4_mark_iloc_dirty(handle, inode, &iloc); |
ac27a0ec1 [PATCH] ext4: ini... |
2062 2063 |
out_err: |
617ba13b3 [PATCH] ext4: ren... |
2064 |
ext4_std_error(inode->i_sb, err); |
ac27a0ec1 [PATCH] ext4: ini... |
2065 |
out: |
3b9d4ed26 ext4: Replace loc... |
2066 |
mutex_unlock(&EXT4_SB(inode->i_sb)->s_orphan_lock); |
ac27a0ec1 [PATCH] ext4: ini... |
2067 2068 2069 2070 2071 2072 |
return err; out_brelse: brelse(iloc.bh); goto out_err; } |
af5bc92dd ext4: Fix whitesp... |
2073 |
static int ext4_rmdir(struct inode *dir, struct dentry *dentry) |
ac27a0ec1 [PATCH] ext4: ini... |
2074 2075 |
{ int retval; |
af5bc92dd ext4: Fix whitesp... |
2076 2077 2078 |
struct inode *inode; struct buffer_head *bh; struct ext4_dir_entry_2 *de; |
ac27a0ec1 [PATCH] ext4: ini... |
2079 2080 2081 2082 |
handle_t *handle; /* Initialize quotas before so that eventual writes go in * separate transaction */ |
871a29315 dquot: cleanup dq... |
2083 2084 |
dquot_initialize(dir); dquot_initialize(dentry->d_inode); |
907f4554e dquot: move dquot... |
2085 |
|
617ba13b3 [PATCH] ext4: ren... |
2086 |
handle = ext4_journal_start(dir, EXT4_DELETE_TRANS_BLOCKS(dir->i_sb)); |
ac27a0ec1 [PATCH] ext4: ini... |
2087 2088 2089 2090 |
if (IS_ERR(handle)) return PTR_ERR(handle); retval = -ENOENT; |
f702ba0fd ext4: Don't use '... |
2091 |
bh = ext4_find_entry(dir, &dentry->d_name, &de); |
ac27a0ec1 [PATCH] ext4: ini... |
2092 2093 2094 2095 |
if (!bh) goto end_rmdir; if (IS_DIRSYNC(dir)) |
0390131ba ext4: Allow ext4 ... |
2096 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
2097 2098 2099 2100 2101 2102 2103 2104 |
inode = dentry->d_inode; retval = -EIO; if (le32_to_cpu(de->inode) != inode->i_ino) goto end_rmdir; retval = -ENOTEMPTY; |
af5bc92dd ext4: Fix whitesp... |
2105 |
if (!empty_dir(inode)) |
ac27a0ec1 [PATCH] ext4: ini... |
2106 |
goto end_rmdir; |
617ba13b3 [PATCH] ext4: ren... |
2107 |
retval = ext4_delete_entry(handle, dir, de, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
2108 2109 |
if (retval) goto end_rmdir; |
f8628a14a ext4: Remove 6500... |
2110 |
if (!EXT4_DIR_LINK_EMPTY(inode)) |
12062dddd ext4: move __func... |
2111 |
ext4_warning(inode->i_sb, |
af5bc92dd ext4: Fix whitesp... |
2112 2113 |
"empty directory has too many links (%d)", inode->i_nlink); |
ac27a0ec1 [PATCH] ext4: ini... |
2114 2115 2116 2117 2118 2119 |
inode->i_version++; clear_nlink(inode); /* 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; |
617ba13b3 [PATCH] ext4: ren... |
2120 |
ext4_orphan_add(handle, inode); |
ef7f38359 ext4: Add nanosec... |
2121 |
inode->i_ctime = dir->i_ctime = dir->i_mtime = ext4_current_time(inode); |
617ba13b3 [PATCH] ext4: ren... |
2122 |
ext4_mark_inode_dirty(handle, inode); |
f8628a14a ext4: Remove 6500... |
2123 |
ext4_dec_count(handle, dir); |
617ba13b3 [PATCH] ext4: ren... |
2124 2125 |
ext4_update_dx_flag(dir); ext4_mark_inode_dirty(handle, dir); |
ac27a0ec1 [PATCH] ext4: ini... |
2126 2127 |
end_rmdir: |
617ba13b3 [PATCH] ext4: ren... |
2128 |
ext4_journal_stop(handle); |
af5bc92dd ext4: Fix whitesp... |
2129 |
brelse(bh); |
ac27a0ec1 [PATCH] ext4: ini... |
2130 2131 |
return retval; } |
af5bc92dd ext4: Fix whitesp... |
2132 |
static int ext4_unlink(struct inode *dir, struct dentry *dentry) |
ac27a0ec1 [PATCH] ext4: ini... |
2133 2134 |
{ int retval; |
af5bc92dd ext4: Fix whitesp... |
2135 2136 2137 |
struct inode *inode; struct buffer_head *bh; struct ext4_dir_entry_2 *de; |
ac27a0ec1 [PATCH] ext4: ini... |
2138 |
handle_t *handle; |
0562e0bad ext4: add more tr... |
2139 |
trace_ext4_unlink_enter(dir, dentry); |
ac27a0ec1 [PATCH] ext4: ini... |
2140 2141 |
/* Initialize quotas before so that eventual writes go * in separate transaction */ |
871a29315 dquot: cleanup dq... |
2142 2143 |
dquot_initialize(dir); dquot_initialize(dentry->d_inode); |
907f4554e dquot: move dquot... |
2144 |
|
617ba13b3 [PATCH] ext4: ren... |
2145 |
handle = ext4_journal_start(dir, EXT4_DELETE_TRANS_BLOCKS(dir->i_sb)); |
ac27a0ec1 [PATCH] ext4: ini... |
2146 2147 2148 2149 |
if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(dir)) |
0390131ba ext4: Allow ext4 ... |
2150 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
2151 2152 |
retval = -ENOENT; |
f702ba0fd ext4: Don't use '... |
2153 |
bh = ext4_find_entry(dir, &dentry->d_name, &de); |
ac27a0ec1 [PATCH] ext4: ini... |
2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 |
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) { |
12062dddd ext4: move __func... |
2164 |
ext4_warning(inode->i_sb, |
af5bc92dd ext4: Fix whitesp... |
2165 2166 |
"Deleting nonexistent file (%lu), %d", inode->i_ino, inode->i_nlink); |
bfe868486 filesystems: add ... |
2167 |
set_nlink(inode, 1); |
ac27a0ec1 [PATCH] ext4: ini... |
2168 |
} |
617ba13b3 [PATCH] ext4: ren... |
2169 |
retval = ext4_delete_entry(handle, dir, de, bh); |
ac27a0ec1 [PATCH] ext4: ini... |
2170 2171 |
if (retval) goto end_unlink; |
ef7f38359 ext4: Add nanosec... |
2172 |
dir->i_ctime = dir->i_mtime = ext4_current_time(dir); |
617ba13b3 [PATCH] ext4: ren... |
2173 2174 |
ext4_update_dx_flag(dir); ext4_mark_inode_dirty(handle, dir); |
825f1481e ext4: Don't use e... |
2175 |
drop_nlink(inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2176 |
if (!inode->i_nlink) |
617ba13b3 [PATCH] ext4: ren... |
2177 |
ext4_orphan_add(handle, inode); |
ef7f38359 ext4: Add nanosec... |
2178 |
inode->i_ctime = ext4_current_time(inode); |
617ba13b3 [PATCH] ext4: ren... |
2179 |
ext4_mark_inode_dirty(handle, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2180 2181 2182 |
retval = 0; end_unlink: |
617ba13b3 [PATCH] ext4: ren... |
2183 |
ext4_journal_stop(handle); |
af5bc92dd ext4: Fix whitesp... |
2184 |
brelse(bh); |
0562e0bad ext4: add more tr... |
2185 |
trace_ext4_unlink_exit(dentry, retval); |
ac27a0ec1 [PATCH] ext4: ini... |
2186 2187 |
return retval; } |
af5bc92dd ext4: Fix whitesp... |
2188 2189 |
static int ext4_symlink(struct inode *dir, struct dentry *dentry, const char *symname) |
ac27a0ec1 [PATCH] ext4: ini... |
2190 2191 |
{ handle_t *handle; |
af5bc92dd ext4: Fix whitesp... |
2192 |
struct inode *inode; |
ac27a0ec1 [PATCH] ext4: ini... |
2193 |
int l, err, retries = 0; |
df5e62234 ext4: fix deadloc... |
2194 |
int credits; |
ac27a0ec1 [PATCH] ext4: ini... |
2195 2196 2197 2198 |
l = strlen(symname)+1; if (l > dir->i_sb->s_blocksize) return -ENAMETOOLONG; |
871a29315 dquot: cleanup dq... |
2199 |
dquot_initialize(dir); |
907f4554e dquot: move dquot... |
2200 |
|
df5e62234 ext4: fix deadloc... |
2201 2202 2203 2204 |
if (l > EXT4_N_BLOCKS * 4) { /* * For non-fast symlinks, we just allocate inode and put it on * orphan list in the first transaction => we need bitmap, |
8c2087199 ext4: Properly co... |
2205 2206 |
* group descriptor, sb, inode block, quota blocks, and * possibly selinux xattr blocks. |
df5e62234 ext4: fix deadloc... |
2207 |
*/ |
8c2087199 ext4: Properly co... |
2208 2209 |
credits = 4 + EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb) + EXT4_XATTR_TRANS_BLOCKS; |
df5e62234 ext4: fix deadloc... |
2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 |
} else { /* * Fast symlink. We have to add entry to directory * (EXT4_DATA_TRANS_BLOCKS + EXT4_INDEX_EXTRA_TRANS_BLOCKS), * allocate new inode (bitmap, group descriptor, inode block, * quota blocks, sb is already counted in previous macros). */ credits = EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 + EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb); } |
ac27a0ec1 [PATCH] ext4: ini... |
2221 |
retry: |
df5e62234 ext4: fix deadloc... |
2222 |
handle = ext4_journal_start(dir, credits); |
ac27a0ec1 [PATCH] ext4: ini... |
2223 2224 2225 2226 |
if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(dir)) |
0390131ba ext4: Allow ext4 ... |
2227 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
2228 |
|
11013911d ext4: teach the i... |
2229 |
inode = ext4_new_inode(handle, dir, S_IFLNK|S_IRWXUGO, |
5cb81dabc ext4: fix quota a... |
2230 |
&dentry->d_name, 0, NULL); |
ac27a0ec1 [PATCH] ext4: ini... |
2231 2232 2233 |
err = PTR_ERR(inode); if (IS_ERR(inode)) goto out_stop; |
df5e62234 ext4: fix deadloc... |
2234 |
if (l > EXT4_N_BLOCKS * 4) { |
617ba13b3 [PATCH] ext4: ren... |
2235 2236 |
inode->i_op = &ext4_symlink_inode_operations; ext4_set_aops(inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2237 |
/* |
df5e62234 ext4: fix deadloc... |
2238 2239 2240 2241 2242 2243 2244 2245 |
* We cannot call page_symlink() with transaction started * because it calls into ext4_write_begin() which can wait * for transaction commit if we are running out of space * and thus we deadlock. 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. |
ac27a0ec1 [PATCH] ext4: ini... |
2246 |
*/ |
df5e62234 ext4: fix deadloc... |
2247 2248 2249 2250 2251 |
drop_nlink(inode); err = ext4_orphan_add(handle, inode); ext4_journal_stop(handle); if (err) goto err_drop_inode; |
54566b2c1 fs: symlink write... |
2252 |
err = __page_symlink(inode, symname, l, 1); |
df5e62234 ext4: fix deadloc... |
2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 |
if (err) goto err_drop_inode; /* * Now inode is being linked into dir (EXT4_DATA_TRANS_BLOCKS * + EXT4_INDEX_EXTRA_TRANS_BLOCKS), inode is also modified */ handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 1); if (IS_ERR(handle)) { err = PTR_ERR(handle); goto err_drop_inode; } |
0ce8c0109 ext[34]: avoid i_... |
2266 |
set_nlink(inode, 1); |
df5e62234 ext4: fix deadloc... |
2267 |
err = ext4_orphan_del(handle, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2268 |
if (err) { |
df5e62234 ext4: fix deadloc... |
2269 |
ext4_journal_stop(handle); |
825f1481e ext4: Don't use e... |
2270 |
clear_nlink(inode); |
df5e62234 ext4: fix deadloc... |
2271 |
goto err_drop_inode; |
ac27a0ec1 [PATCH] ext4: ini... |
2272 2273 |
} } else { |
e65187e6d ext4: Enable exte... |
2274 |
/* clear the extent format for fast symlink */ |
12e9b8920 ext4: Use bitops ... |
2275 |
ext4_clear_inode_flag(inode, EXT4_INODE_EXTENTS); |
617ba13b3 [PATCH] ext4: ren... |
2276 |
inode->i_op = &ext4_fast_symlink_inode_operations; |
af5bc92dd ext4: Fix whitesp... |
2277 |
memcpy((char *)&EXT4_I(inode)->i_data, symname, l); |
ac27a0ec1 [PATCH] ext4: ini... |
2278 2279 |
inode->i_size = l-1; } |
617ba13b3 [PATCH] ext4: ren... |
2280 2281 |
EXT4_I(inode)->i_disksize = inode->i_size; err = ext4_add_nondir(handle, dentry, inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2282 |
out_stop: |
617ba13b3 [PATCH] ext4: ren... |
2283 2284 |
ext4_journal_stop(handle); if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) |
ac27a0ec1 [PATCH] ext4: ini... |
2285 2286 |
goto retry; return err; |
df5e62234 ext4: fix deadloc... |
2287 2288 2289 2290 |
err_drop_inode: unlock_new_inode(inode); iput(inode); return err; |
ac27a0ec1 [PATCH] ext4: ini... |
2291 |
} |
af5bc92dd ext4: Fix whitesp... |
2292 2293 |
static int ext4_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) |
ac27a0ec1 [PATCH] ext4: ini... |
2294 2295 2296 2297 |
{ handle_t *handle; struct inode *inode = old_dentry->d_inode; int err, retries = 0; |
b05ab1dc3 ext4: Limit numbe... |
2298 |
if (inode->i_nlink >= EXT4_LINK_MAX) |
ac27a0ec1 [PATCH] ext4: ini... |
2299 |
return -EMLINK; |
f8628a14a ext4: Remove 6500... |
2300 |
|
871a29315 dquot: cleanup dq... |
2301 |
dquot_initialize(dir); |
907f4554e dquot: move dquot... |
2302 |
|
ac27a0ec1 [PATCH] ext4: ini... |
2303 |
retry: |
617ba13b3 [PATCH] ext4: ren... |
2304 2305 |
handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + EXT4_INDEX_EXTRA_TRANS_BLOCKS); |
ac27a0ec1 [PATCH] ext4: ini... |
2306 2307 2308 2309 |
if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(dir)) |
0390131ba ext4: Allow ext4 ... |
2310 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
2311 |
|
ef7f38359 ext4: Add nanosec... |
2312 |
inode->i_ctime = ext4_current_time(inode); |
f8628a14a ext4: Remove 6500... |
2313 |
ext4_inc_count(handle, inode); |
7de9c6ee3 new helper: ihold() |
2314 |
ihold(inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2315 |
|
6b38e842b nfsd race fixes: ... |
2316 2317 2318 2319 2320 2321 2322 2323 |
err = ext4_add_entry(handle, dentry, inode); if (!err) { ext4_mark_inode_dirty(handle, inode); d_instantiate(dentry, inode); } else { drop_nlink(inode); iput(inode); } |
617ba13b3 [PATCH] ext4: ren... |
2324 2325 |
ext4_journal_stop(handle); if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) |
ac27a0ec1 [PATCH] ext4: ini... |
2326 2327 2328 |
goto retry; return err; } |
3d0518f47 ext4: New rec_len... |
2329 2330 |
#define PARENT_INO(buffer, size) \ (ext4_next_entry((struct ext4_dir_entry_2 *)(buffer), size)->inode) |
ac27a0ec1 [PATCH] ext4: ini... |
2331 2332 2333 2334 2335 |
/* * Anybody can rename anything with this: the permission checks are left to the * higher-level routines. */ |
af5bc92dd ext4: Fix whitesp... |
2336 2337 |
static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry) |
ac27a0ec1 [PATCH] ext4: ini... |
2338 2339 |
{ handle_t *handle; |
af5bc92dd ext4: Fix whitesp... |
2340 2341 2342 |
struct inode *old_inode, *new_inode; struct buffer_head *old_bh, *new_bh, *dir_bh; struct ext4_dir_entry_2 *old_de, *new_de; |
8750c6d5f ext4: Automatical... |
2343 |
int retval, force_da_alloc = 0; |
ac27a0ec1 [PATCH] ext4: ini... |
2344 |
|
871a29315 dquot: cleanup dq... |
2345 2346 |
dquot_initialize(old_dir); dquot_initialize(new_dir); |
907f4554e dquot: move dquot... |
2347 |
|
ac27a0ec1 [PATCH] ext4: ini... |
2348 2349 2350 2351 2352 |
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... |
2353 |
dquot_initialize(new_dentry->d_inode); |
617ba13b3 [PATCH] ext4: ren... |
2354 2355 2356 |
handle = ext4_journal_start(old_dir, 2 * EXT4_DATA_TRANS_BLOCKS(old_dir->i_sb) + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2); |
ac27a0ec1 [PATCH] ext4: ini... |
2357 2358 2359 2360 |
if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir)) |
0390131ba ext4: Allow ext4 ... |
2361 |
ext4_handle_sync(handle); |
ac27a0ec1 [PATCH] ext4: ini... |
2362 |
|
f702ba0fd ext4: Don't use '... |
2363 |
old_bh = ext4_find_entry(old_dir, &old_dentry->d_name, &old_de); |
ac27a0ec1 [PATCH] ext4: ini... |
2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 |
/* * 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; |
f702ba0fd ext4: Don't use '... |
2376 |
new_bh = ext4_find_entry(new_dir, &new_dentry->d_name, &new_de); |
ac27a0ec1 [PATCH] ext4: ini... |
2377 2378 |
if (new_bh) { if (!new_inode) { |
af5bc92dd ext4: Fix whitesp... |
2379 |
brelse(new_bh); |
ac27a0ec1 [PATCH] ext4: ini... |
2380 2381 2382 2383 2384 2385 |
new_bh = NULL; } } if (S_ISDIR(old_inode->i_mode)) { if (new_inode) { retval = -ENOTEMPTY; |
af5bc92dd ext4: Fix whitesp... |
2386 |
if (!empty_dir(new_inode)) |
ac27a0ec1 [PATCH] ext4: ini... |
2387 2388 2389 |
goto end_rename; } retval = -EIO; |
af5bc92dd ext4: Fix whitesp... |
2390 |
dir_bh = ext4_bread(handle, old_inode, 0, 0, &retval); |
ac27a0ec1 [PATCH] ext4: ini... |
2391 2392 |
if (!dir_bh) goto end_rename; |
3d0518f47 ext4: New rec_len... |
2393 2394 |
if (le32_to_cpu(PARENT_INO(dir_bh->b_data, old_dir->i_sb->s_blocksize)) != old_dir->i_ino) |
ac27a0ec1 [PATCH] ext4: ini... |
2395 2396 |
goto end_rename; retval = -EMLINK; |
af5bc92dd ext4: Fix whitesp... |
2397 |
if (!new_inode && new_dir != old_dir && |
2c94eb86c ext4: Allow renam... |
2398 |
EXT4_DIR_LINK_MAX(new_dir)) |
ac27a0ec1 [PATCH] ext4: ini... |
2399 |
goto end_rename; |
ef6078930 ext4: handle erro... |
2400 2401 2402 2403 |
BUFFER_TRACE(dir_bh, "get_write_access"); retval = ext4_journal_get_write_access(handle, dir_bh); if (retval) goto end_rename; |
ac27a0ec1 [PATCH] ext4: ini... |
2404 2405 |
} if (!new_bh) { |
af5bc92dd ext4: Fix whitesp... |
2406 |
retval = ext4_add_entry(handle, new_dentry, old_inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2407 2408 2409 2410 |
if (retval) goto end_rename; } else { BUFFER_TRACE(new_bh, "get write access"); |
ef6078930 ext4: handle erro... |
2411 2412 2413 |
retval = ext4_journal_get_write_access(handle, new_bh); if (retval) goto end_rename; |
ac27a0ec1 [PATCH] ext4: ini... |
2414 |
new_de->inode = cpu_to_le32(old_inode->i_ino); |
617ba13b3 [PATCH] ext4: ren... |
2415 2416 |
if (EXT4_HAS_INCOMPAT_FEATURE(new_dir->i_sb, EXT4_FEATURE_INCOMPAT_FILETYPE)) |
ac27a0ec1 [PATCH] ext4: ini... |
2417 2418 |
new_de->file_type = old_de->file_type; new_dir->i_version++; |
53b7e9f68 ext4: Fix update ... |
2419 2420 2421 |
new_dir->i_ctime = new_dir->i_mtime = ext4_current_time(new_dir); ext4_mark_inode_dirty(handle, new_dir); |
0390131ba ext4: Allow ext4 ... |
2422 |
BUFFER_TRACE(new_bh, "call ext4_handle_dirty_metadata"); |
b40971426 ext4: add error c... |
2423 2424 2425 2426 2427 |
retval = ext4_handle_dirty_metadata(handle, new_dir, new_bh); if (unlikely(retval)) { ext4_std_error(new_dir->i_sb, retval); goto end_rename; } |
ac27a0ec1 [PATCH] ext4: ini... |
2428 2429 2430 2431 2432 2433 2434 2435 |
brelse(new_bh); new_bh = NULL; } /* * Like most other Unix systems, set the ctime for inodes on a * rename. */ |
ef7f38359 ext4: Add nanosec... |
2436 |
old_inode->i_ctime = ext4_current_time(old_inode); |
617ba13b3 [PATCH] ext4: ren... |
2437 |
ext4_mark_inode_dirty(handle, old_inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2438 2439 2440 2441 2442 2443 2444 |
/* * 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) || |
617ba13b3 [PATCH] ext4: ren... |
2445 |
(retval = ext4_delete_entry(handle, old_dir, |
ac27a0ec1 [PATCH] ext4: ini... |
2446 2447 2448 2449 2450 2451 |
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; |
617ba13b3 [PATCH] ext4: ren... |
2452 |
struct ext4_dir_entry_2 *old_de2; |
ac27a0ec1 [PATCH] ext4: ini... |
2453 |
|
f702ba0fd ext4: Don't use '... |
2454 |
old_bh2 = ext4_find_entry(old_dir, &old_dentry->d_name, &old_de2); |
ac27a0ec1 [PATCH] ext4: ini... |
2455 |
if (old_bh2) { |
617ba13b3 [PATCH] ext4: ren... |
2456 |
retval = ext4_delete_entry(handle, old_dir, |
ac27a0ec1 [PATCH] ext4: ini... |
2457 2458 2459 2460 2461 |
old_de2, old_bh2); brelse(old_bh2); } } if (retval) { |
12062dddd ext4: move __func... |
2462 |
ext4_warning(old_dir->i_sb, |
ac27a0ec1 [PATCH] ext4: ini... |
2463 2464 2465 2466 2467 |
"Deleting old file (%lu), %d, error=%d", old_dir->i_ino, old_dir->i_nlink, retval); } if (new_inode) { |
f8628a14a ext4: Remove 6500... |
2468 |
ext4_dec_count(handle, new_inode); |
ef7f38359 ext4: Add nanosec... |
2469 |
new_inode->i_ctime = ext4_current_time(new_inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2470 |
} |
ef7f38359 ext4: Add nanosec... |
2471 |
old_dir->i_ctime = old_dir->i_mtime = ext4_current_time(old_dir); |
617ba13b3 [PATCH] ext4: ren... |
2472 |
ext4_update_dx_flag(old_dir); |
ac27a0ec1 [PATCH] ext4: ini... |
2473 |
if (dir_bh) { |
3d0518f47 ext4: New rec_len... |
2474 2475 |
PARENT_INO(dir_bh->b_data, new_dir->i_sb->s_blocksize) = cpu_to_le32(new_dir->i_ino); |
0390131ba ext4: Allow ext4 ... |
2476 |
BUFFER_TRACE(dir_bh, "call ext4_handle_dirty_metadata"); |
bcaa99297 ext4: ext4_rename... |
2477 |
retval = ext4_handle_dirty_metadata(handle, old_inode, dir_bh); |
b40971426 ext4: add error c... |
2478 2479 2480 2481 |
if (retval) { ext4_std_error(old_dir->i_sb, retval); goto end_rename; } |
f8628a14a ext4: Remove 6500... |
2482 |
ext4_dec_count(handle, old_dir); |
ac27a0ec1 [PATCH] ext4: ini... |
2483 |
if (new_inode) { |
f8628a14a ext4: Remove 6500... |
2484 |
/* checked empty_dir above, can't have another parent, |
825f1481e ext4: Don't use e... |
2485 |
* ext4_dec_count() won't work for many-linked dirs */ |
6d6b77f16 filesystems: add ... |
2486 |
clear_nlink(new_inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2487 |
} else { |
f8628a14a ext4: Remove 6500... |
2488 |
ext4_inc_count(handle, new_dir); |
617ba13b3 [PATCH] ext4: ren... |
2489 2490 |
ext4_update_dx_flag(new_dir); ext4_mark_inode_dirty(handle, new_dir); |
ac27a0ec1 [PATCH] ext4: ini... |
2491 2492 |
} } |
617ba13b3 [PATCH] ext4: ren... |
2493 |
ext4_mark_inode_dirty(handle, old_dir); |
ac27a0ec1 [PATCH] ext4: ini... |
2494 |
if (new_inode) { |
617ba13b3 [PATCH] ext4: ren... |
2495 |
ext4_mark_inode_dirty(handle, new_inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2496 |
if (!new_inode->i_nlink) |
617ba13b3 [PATCH] ext4: ren... |
2497 |
ext4_orphan_add(handle, new_inode); |
afd4672dc ext4: Add auto_da... |
2498 2499 |
if (!test_opt(new_dir->i_sb, NO_AUTO_DA_ALLOC)) force_da_alloc = 1; |
ac27a0ec1 [PATCH] ext4: ini... |
2500 2501 2502 2503 |
} retval = 0; end_rename: |
af5bc92dd ext4: Fix whitesp... |
2504 2505 2506 |
brelse(dir_bh); brelse(old_bh); brelse(new_bh); |
617ba13b3 [PATCH] ext4: ren... |
2507 |
ext4_journal_stop(handle); |
8750c6d5f ext4: Automatical... |
2508 2509 |
if (retval == 0 && force_da_alloc) ext4_alloc_da_blocks(old_inode); |
ac27a0ec1 [PATCH] ext4: ini... |
2510 2511 2512 2513 2514 2515 |
return retval; } /* * directories can handle most operations... */ |
754661f14 [PATCH] mark stru... |
2516 |
const struct inode_operations ext4_dir_inode_operations = { |
617ba13b3 [PATCH] ext4: ren... |
2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 |
.create = ext4_create, .lookup = ext4_lookup, .link = ext4_link, .unlink = ext4_unlink, .symlink = ext4_symlink, .mkdir = ext4_mkdir, .rmdir = ext4_rmdir, .mknod = ext4_mknod, .rename = ext4_rename, .setattr = ext4_setattr, |
03010a335 ext4: Rename ext4... |
2527 |
#ifdef CONFIG_EXT4_FS_XATTR |
ac27a0ec1 [PATCH] ext4: ini... |
2528 2529 |
.setxattr = generic_setxattr, .getxattr = generic_getxattr, |
617ba13b3 [PATCH] ext4: ren... |
2530 |
.listxattr = ext4_listxattr, |
ac27a0ec1 [PATCH] ext4: ini... |
2531 2532 |
.removexattr = generic_removexattr, #endif |
4e34e719e fs: take the ACL ... |
2533 |
.get_acl = ext4_get_acl, |
abc8746eb ext4: hook fiemap... |
2534 |
.fiemap = ext4_fiemap, |
ac27a0ec1 [PATCH] ext4: ini... |
2535 |
}; |
754661f14 [PATCH] mark stru... |
2536 |
const struct inode_operations ext4_special_inode_operations = { |
617ba13b3 [PATCH] ext4: ren... |
2537 |
.setattr = ext4_setattr, |
03010a335 ext4: Rename ext4... |
2538 |
#ifdef CONFIG_EXT4_FS_XATTR |
ac27a0ec1 [PATCH] ext4: ini... |
2539 2540 |
.setxattr = generic_setxattr, .getxattr = generic_getxattr, |
617ba13b3 [PATCH] ext4: ren... |
2541 |
.listxattr = ext4_listxattr, |
ac27a0ec1 [PATCH] ext4: ini... |
2542 2543 |
.removexattr = generic_removexattr, #endif |
4e34e719e fs: take the ACL ... |
2544 |
.get_acl = ext4_get_acl, |
ac27a0ec1 [PATCH] ext4: ini... |
2545 |
}; |