diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-05-01 18:47:17 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-05-01 18:47:17 +0100 |
| commit | 27c72b040c0be8f3704ed0b6b84c12cbba24a7e8 (patch) | |
| tree | 0b84847120e817465d517d21fa4653d958222567 /fs/jffs2/write.c | |
| parent | 1b690b48786229571e590dd22fe01ecc22a8746b (diff) | |
| download | linux-stable-27c72b040c0be8f3704ed0b6b84c12cbba24a7e8.tar.gz linux-stable-27c72b040c0be8f3704ed0b6b84c12cbba24a7e8.tar.bz2 linux-stable-27c72b040c0be8f3704ed0b6b84c12cbba24a7e8.zip | |
[JFFS2] Track parent inode for directories (for NFS export)
To support NFS export, we need to know the parent inode of directories.
Rather than growing the jffs2_inode_cache structure, share space with
the nlink field -- which was always set to 1 for directories anyway.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/write.c')
| -rw-r--r-- | fs/jffs2/write.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c index 87891bdd7915..ca29440e9435 100644 --- a/fs/jffs2/write.c +++ b/fs/jffs2/write.c @@ -19,7 +19,8 @@ #include "compr.h" -int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint32_t mode, struct jffs2_raw_inode *ri) +int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, + uint32_t mode, struct jffs2_raw_inode *ri) { struct jffs2_inode_cache *ic; @@ -31,7 +32,7 @@ int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint memset(ic, 0, sizeof(*ic)); f->inocache = ic; - f->inocache->nlink = 1; + f->inocache->pino_nlink = 1; /* Will be overwritten shortly for directories */ f->inocache->nodes = (struct jffs2_raw_node_ref *)f->inocache; f->inocache->state = INO_STATE_PRESENT; @@ -635,9 +636,9 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, jffs2_mark_node_obsolete(c, fd->raw); jffs2_free_full_dirent(fd); } - } - - dead_f->inocache->nlink--; + dead_f->inocache->pino_nlink = 0; + } else + dead_f->inocache->pino_nlink--; /* NB: Caller must set inode nlink if appropriate */ mutex_unlock(&dead_f->sem); } |