diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-25 16:15:43 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-08 02:55:04 -0500 |
commit | b7f7a5e0be94d13875a1c6c9aa65eeb11a46fc1b (patch) | |
tree | 69145a46a70aae7ba6bf0e03b46617bbb74f1a1b /fs/f2fs/dir.c | |
parent | 69f24eac55725859a89c440ee2d19f36fa09e8fc (diff) |
f2fs: get rid of fake on-stack dentries
those should never be used for a lot of reasons...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/f2fs/dir.c')
-rw-r--r-- | fs/f2fs/dir.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 208a804180d6..47df9252ad6a 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c | |||
@@ -370,7 +370,7 @@ next: | |||
370 | goto next; | 370 | goto next; |
371 | } | 371 | } |
372 | 372 | ||
373 | int f2fs_add_link(struct dentry *dentry, struct inode *inode) | 373 | int __f2fs_add_link(struct inode *dir, const struct qstr *name, struct inode *inode) |
374 | { | 374 | { |
375 | unsigned int bit_pos; | 375 | unsigned int bit_pos; |
376 | unsigned int level; | 376 | unsigned int level; |
@@ -379,17 +379,15 @@ int f2fs_add_link(struct dentry *dentry, struct inode *inode) | |||
379 | f2fs_hash_t dentry_hash; | 379 | f2fs_hash_t dentry_hash; |
380 | struct f2fs_dir_entry *de; | 380 | struct f2fs_dir_entry *de; |
381 | unsigned int nbucket, nblock; | 381 | unsigned int nbucket, nblock; |
382 | struct inode *dir = dentry->d_parent->d_inode; | ||
383 | struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb); | 382 | struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb); |
384 | const char *name = dentry->d_name.name; | 383 | size_t namelen = name->len; |
385 | size_t namelen = dentry->d_name.len; | ||
386 | struct page *dentry_page = NULL; | 384 | struct page *dentry_page = NULL; |
387 | struct f2fs_dentry_block *dentry_blk = NULL; | 385 | struct f2fs_dentry_block *dentry_blk = NULL; |
388 | int slots = GET_DENTRY_SLOTS(namelen); | 386 | int slots = GET_DENTRY_SLOTS(namelen); |
389 | int err = 0; | 387 | int err = 0; |
390 | int i; | 388 | int i; |
391 | 389 | ||
392 | dentry_hash = f2fs_dentry_hash(name, dentry->d_name.len); | 390 | dentry_hash = f2fs_dentry_hash(name->name, name->len); |
393 | level = 0; | 391 | level = 0; |
394 | current_depth = F2FS_I(dir)->i_current_depth; | 392 | current_depth = F2FS_I(dir)->i_current_depth; |
395 | if (F2FS_I(dir)->chash == dentry_hash) { | 393 | if (F2FS_I(dir)->chash == dentry_hash) { |
@@ -432,7 +430,7 @@ start: | |||
432 | ++level; | 430 | ++level; |
433 | goto start; | 431 | goto start; |
434 | add_dentry: | 432 | add_dentry: |
435 | err = init_inode_metadata(inode, dir, &dentry->d_name); | 433 | err = init_inode_metadata(inode, dir, name); |
436 | if (err) | 434 | if (err) |
437 | goto fail; | 435 | goto fail; |
438 | 436 | ||
@@ -441,7 +439,7 @@ add_dentry: | |||
441 | de = &dentry_blk->dentry[bit_pos]; | 439 | de = &dentry_blk->dentry[bit_pos]; |
442 | de->hash_code = dentry_hash; | 440 | de->hash_code = dentry_hash; |
443 | de->name_len = cpu_to_le16(namelen); | 441 | de->name_len = cpu_to_le16(namelen); |
444 | memcpy(dentry_blk->filename[bit_pos], name, namelen); | 442 | memcpy(dentry_blk->filename[bit_pos], name->name, name->len); |
445 | de->ino = cpu_to_le32(inode->i_ino); | 443 | de->ino = cpu_to_le32(inode->i_ino); |
446 | set_de_type(de, inode); | 444 | set_de_type(de, inode); |
447 | for (i = 0; i < slots; i++) | 445 | for (i = 0; i < slots; i++) |