diff options
author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2010-08-25 04:45:44 -0400 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2010-10-22 20:24:34 -0400 |
commit | 4d8d9293dce503eb0e083e17a02a328d397e7f00 (patch) | |
tree | ffa2dce7f100b1346131adc01cf93e280b225509 /fs/nilfs2/namei.c | |
parent | ba65ae4729bf81c58d9fc847f67d57eec525b042 (diff) |
nilfs2: set pointer to root object in inodes
This puts a pointer to nilfs_root object in the private part of
on-memory inode, and makes nilfs_iget function pick up the inode with
the same root object.
Non-root inodes inherit its nilfs_root object from parent inode. That
of the root inode is allocated through nilfs_attach_checkpoint()
function.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2/namei.c')
-rw-r--r-- | fs/nilfs2/namei.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index ad6ed2cf19b4..1110d56a23f5 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c | |||
@@ -70,7 +70,7 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) | |||
70 | ino = nilfs_inode_by_name(dir, &dentry->d_name); | 70 | ino = nilfs_inode_by_name(dir, &dentry->d_name); |
71 | inode = NULL; | 71 | inode = NULL; |
72 | if (ino) { | 72 | if (ino) { |
73 | inode = nilfs_iget(dir->i_sb, ino); | 73 | inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino); |
74 | if (IS_ERR(inode)) | 74 | if (IS_ERR(inode)) |
75 | return ERR_CAST(inode); | 75 | return ERR_CAST(inode); |
76 | } | 76 | } |
@@ -87,7 +87,8 @@ struct dentry *nilfs_get_parent(struct dentry *child) | |||
87 | if (!ino) | 87 | if (!ino) |
88 | return ERR_PTR(-ENOENT); | 88 | return ERR_PTR(-ENOENT); |
89 | 89 | ||
90 | inode = nilfs_iget(child->d_inode->i_sb, ino); | 90 | inode = nilfs_iget(child->d_inode->i_sb, |
91 | NILFS_I(child->d_inode)->i_root, ino); | ||
91 | if (IS_ERR(inode)) | 92 | if (IS_ERR(inode)) |
92 | return ERR_CAST(inode); | 93 | return ERR_CAST(inode); |
93 | return d_obtain_alias(inode); | 94 | return d_obtain_alias(inode); |