Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359001
b: refs/heads/master
c: c004363
h: refs/heads/master
i:
  358999: 6cb0fdd
v: v3
  • Loading branch information
Al Viro committed Feb 8, 2013
1 parent 92c778c commit 83cc49b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53dc9a67769d0a9733adb5156adfc07edcbc1ea3
refs/heads/master: c004363dd6aa89f1ccbebd694f261f86db0c840a
2 changes: 1 addition & 1 deletion trunk/fs/f2fs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ static int init_inode_metadata(struct inode *inode, struct dentry *dentry)

if (is_inode_flag_set(F2FS_I(inode), FI_NEW_INODE)) {
int err;
err = new_inode_page(inode, dentry);
err = new_inode_page(inode, &dentry->d_name);
if (err)
return err;

Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/f2fs/f2fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ void get_node_info(struct f2fs_sb_info *, nid_t, struct node_info *);
int get_dnode_of_data(struct dnode_of_data *, pgoff_t, int);
int truncate_inode_blocks(struct inode *, pgoff_t);
int remove_inode_page(struct inode *);
int new_inode_page(struct inode *, struct dentry *);
int new_inode_page(struct inode *, const struct qstr *);
struct page *new_node_page(struct dnode_of_data *, unsigned int);
void ra_node_page(struct f2fs_sb_info *, nid_t);
struct page *get_node_page(struct f2fs_sb_info *, pgoff_t);
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/f2fs/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ int remove_inode_page(struct inode *inode)
return 0;
}

int new_inode_page(struct inode *inode, struct dentry *dentry)
int new_inode_page(struct inode *inode, const struct qstr *name)
{
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
struct page *page;
Expand All @@ -790,7 +790,7 @@ int new_inode_page(struct inode *inode, struct dentry *dentry)
set_new_dnode(&dn, inode, NULL, NULL, inode->i_ino);
mutex_lock_op(sbi, NODE_NEW);
page = new_node_page(&dn, 0);
init_dent_inode(&dentry->d_name, page);
init_dent_inode(name, page);
mutex_unlock_op(sbi, NODE_NEW);
if (IS_ERR(page))
return PTR_ERR(page);
Expand Down

0 comments on commit 83cc49b

Please sign in to comment.